Skip to content

Commit 79466a0

Browse files
committed
fix gradle
1 parent 6db450a commit 79466a0

6 files changed

Lines changed: 9 additions & 11 deletions

File tree

android_app/build.gradle.kts

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -61,10 +61,6 @@ android {
6161
// sourceCompatibility = JavaVersion.VERSION_17
6262
// targetCompatibility = JavaVersion.VERSION_17
6363
// }
64-
kotlinOptions {
65-
// jvmTarget = "17"
66-
freeCompilerArgs = listOf("-Xallow-kotlin-package")
67-
}
6864
buildFeatures {
6965
compose = true
7066
}
@@ -73,6 +69,12 @@ android {
7369
}
7470
}
7571

72+
kotlin {
73+
compilerOptions {
74+
freeCompilerArgs.add("-Xallow-kotlin-package")
75+
}
76+
}
77+
7678
dependencies {
7779
implementation(project(":common_app"))
7880
implementation("androidx.core:core-ktx:1.3.2")

common_app/build.gradle.kts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
import org.jetbrains.kotlin.gradle.dsl.JvmTarget
2-
import org.jetbrains.kotlin.gradle.targets.js.dsl.ExperimentalWasmDsl
32
import org.jetbrains.kotlin.gradle.targets.js.webpack.KotlinWebpackConfig
43

54
/*

gradle.properties

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@ kotlin.native.cocoapods.generate.wrapper=true
4141
org.jetbrains.compose.experimental.jscanvas.enabled=true
4242
org.jetbrains.compose.experimental.macos.enabled=true
4343
org.jetbrains.compose.experimental.uikit.enabled=true
44-
kotlin.native.useEmbeddableCompilerJar=true
4544
kotlin.mpp.androidSourceSetLayoutVersion=2
4645
# Enable kotlin/native experimental memory model
4746
kotlin.native.binary.memoryModel=experimental
@@ -52,4 +51,4 @@ compose.version=1.11.1
5251
ksp.version=2.3.9
5352

5453
#kn(ios)cross-compilation: https://www.jetbrains.com/help/kotlin-multiplatform-dev/multiplatform-publish-lib-setup.html#host-requirements
55-
kotlin.native.enableKlibsCrossCompilation=true
54+
kotlin.native.enableKlibsCrossCompilation=true

gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.11-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
44
networkTimeout=10000
55
validateDistributionUrl=true
66
zipStoreBase=GRADLE_USER_HOME

settings.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ pluginManagement {
3939
val kotlinVersion = extra["kotlin.version"] as String
4040
val composeVersion = extra["compose.version"] as String
4141
val kspVersion = extra["ksp.version"] as String
42-
val agpVersion = "8.7.0"
42+
val agpVersion = "8.10.1"
4343

4444
kotlin("jvm").version(kotlinVersion)
4545
kotlin("multiplatform").version(kotlinVersion)

wasm_app/build.gradle.kts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
import org.jetbrains.kotlin.gradle.targets.js.dsl.ExperimentalWasmDsl
21
import org.jetbrains.kotlin.gradle.targets.js.webpack.KotlinWebpackConfig
32

43
/*
@@ -24,7 +23,6 @@ plugins {
2423
}
2524

2625
kotlin {
27-
@OptIn(ExperimentalWasmDsl::class)
2826
wasmJs {
2927
outputModuleName = "wasm_app"
3028
browser {

0 commit comments

Comments
 (0)