Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
.gradle
.kotlin
build/
chart.podspec
yarn.lock
!gradle/wrapper/gradle-wrapper.jar
!**/src/main/**/build/
!**/src/test/**/build/
Expand Down
17 changes: 14 additions & 3 deletions android/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,15 +1,20 @@
import org.gradle.kotlin.dsl.assign
import org.gradle.kotlin.dsl.withType
import org.jetbrains.kotlin.gradle.dsl.JvmTarget
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile

plugins {
id("org.jetbrains.compose")version "1.6.10"
id("org.jetbrains.compose")
id("com.android.application")
kotlin("android")
id ("org.jetbrains.kotlin.plugin.compose") version "2.0.0"
id ("org.jetbrains.kotlin.plugin.compose") version("2.3.0")
}

group = "com.aay"
version = "1.0"

repositories {
jcenter()
mavenCentral()
}

dependencies {
Expand Down Expand Up @@ -38,3 +43,9 @@ android {
}
}

tasks.withType<KotlinCompile>().configureEach {
compilerOptions {
jvmTarget = JvmTarget.JVM_11
}
}

4 changes: 2 additions & 2 deletions android/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.aay">
<manifest xmlns:android="http://schemas.android.com/apk/res/android">
<application
android:theme="@style/Theme.AppCompat.Light.NoActionBar">
<activity android:name=".MainActivity" android:exported="true">
<activity android:name="com.aay.android.MainActivity" android:exported="true">
<intent-filter>
<action android:name="android.intent.action.MAIN"/>
<category android:name="android.intent.category.LAUNCHER"/>
Expand Down
1 change: 0 additions & 1 deletion build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -13,5 +13,4 @@ plugins {
id("com.android.application") apply false
id("com.android.library") apply false
id("org.jetbrains.compose") apply false

}
13 changes: 6 additions & 7 deletions chart/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import org.jetbrains.kotlin.gradle.targets.js.dsl.ExperimentalWasmDsl
import org.jetbrains.kotlin.gradle.dsl.JvmTarget
import org.jetbrains.kotlin.gradle.targets.js.webpack.KotlinWebpackConfig

plugins {
Expand All @@ -15,13 +15,13 @@ group = "io.github.thechance101"
version = "1.1.0"

kotlin {
jvmToolchain {
(this as JavaToolchainSpec).languageVersion.set(JavaLanguageVersion.of(11))
}

androidTarget {
publishLibraryVariants("release")
compilerOptions {
jvmTarget = JvmTarget.JVM_11
}
}

jvm("desktop")

iosX64 {
Expand Down Expand Up @@ -62,9 +62,8 @@ kotlin {
binaries.executable()
}

@OptIn(ExperimentalWasmDsl::class)
wasmJs {
moduleName = "chart"
outputModuleName = "chart"
browser {
commonWebpackConfig {
outputFileName = "AAY-Chart.js"
Expand Down
20 changes: 12 additions & 8 deletions common/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import org.jetbrains.compose.compose
import org.jetbrains.kotlin.gradle.targets.js.dsl.ExperimentalWasmDsl
import org.jetbrains.kotlin.gradle.dsl.JvmTarget
import org.jetbrains.kotlin.gradle.targets.js.webpack.KotlinWebpackConfig
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile

plugins {
alias(libs.plugins.kotlin)
Expand All @@ -13,13 +13,17 @@ group = "com.aay"
version = "1.0-SNAPSHOT"

kotlin {
android()
jvm("desktop")

androidTarget {
compilerOptions {
jvmTarget = JvmTarget.JVM_11
}
}

// WASM Target
@OptIn(ExperimentalWasmDsl::class)
wasmJs {
moduleName = "composeApp"
outputModuleName = "composeApp"
browser {
commonWebpackConfig {
outputFileName = "AAY-Chart.js"
Expand Down Expand Up @@ -54,7 +58,7 @@ kotlin {
}

val wasmJsMain by getting {
dependencies{
dependencies {
api(compose.runtime)
api(compose.foundation)
api(compose.material)
Expand All @@ -72,7 +76,7 @@ android {
targetSdkVersion(34)
}
compileOptions {
sourceCompatibility = JavaVersion.VERSION_1_8
targetCompatibility = JavaVersion.VERSION_1_8
sourceCompatibility = JavaVersion.VERSION_11
targetCompatibility = JavaVersion.VERSION_11
}
}
2 changes: 1 addition & 1 deletion common/src/androidMain/AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.aay.common"/>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"/>
4 changes: 1 addition & 3 deletions desktop/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,7 @@ version = "1.0-SNAPSHOT"


kotlin {
jvm {
withJava()
}
jvm()

val osName = System.getProperty("os.name")
val targetOs = when {
Expand Down
4 changes: 2 additions & 2 deletions gradle.properties
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
kotlin.code.style=official
android.useAndroidX=true
kotlin.version=2.0.0
agp.version=8.1.1
kotlin.version=2.3.0
agp.version=8.12.0
compose.version=1.6.10
org.jetbrains.compose.experimental.uikit.enabled=true
xcodeproj=./iosApp
Expand Down
4 changes: 2 additions & 2 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[versions]
kotlin = "2.0.0"
kotlin = "2.3.0"
compose = "1.6.10"
composePlugin = "2.0.0"
composePlugin = "2.3.0"
appcompat = "1.7.0"
coreKtx = "1.10.0"
dokka = "1.5.0"
Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-9.2.1-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
5 changes: 1 addition & 4 deletions wasm/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import org.jetbrains.kotlin.gradle.targets.js.dsl.ExperimentalWasmDsl
import org.jetbrains.kotlin.gradle.targets.js.webpack.KotlinWebpackConfig

plugins {
Expand All @@ -8,9 +7,8 @@ plugins {
}

kotlin {
@OptIn(ExperimentalWasmDsl::class)
wasmJs {
moduleName = "wasm"
outputModuleName = "wasm"
browser {
commonWebpackConfig {
outputFileName = "wasm.js"
Expand All @@ -33,7 +31,6 @@ kotlin {
implementation(compose.components.resources)
implementation(compose.components.uiToolingPreview)
}

}
}
}