Skip to content

Commit 6c46575

Browse files
committed
#333 fix compilation with compose
1 parent adf341e commit 6c46575

5 files changed

Lines changed: 11 additions & 6 deletions

File tree

build.gradle.kts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ buildscript {
1313
}
1414
dependencies {
1515
classpath("dev.icerock.moko:resources-generator")
16-
classpath("org.jetbrains.compose:compose-gradle-plugin:1.0.1")
17-
classpath("com.gradleup:auto-manifest-plugin:1.1.1")
16+
classpath(libs.composeJetBrainsPlugin)
17+
classpath(libs.autoManifestPlugin)
1818
classpath(":resources-build-logic")
1919
}
2020
}

gradle/libs.versions.toml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[versions]
2-
kotlinVersion = "1.6.21"
2+
kotlinVersion = "1.6.10"
33
androidGradleVersion = "7.1.0"
44

55
# kotlinx
@@ -85,7 +85,13 @@ kotlinTestAnnotations = { module = "org.jetbrains.kotlin:kotlin-test-annotations
8585

8686
# gradle
8787
kotlinGradlePlugin = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin", version.ref = "kotlinVersion" }
88+
# This version is used to fix compatibility issues between
89+
# Kotlin Gradle Plugin 1.6.10 -> 1.6.20
90+
# we can't update all project to 1.6.20 now because Jetpack Compose not updated yet
91+
kotlinGradlePluginNext = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin", version = "1.6.21" }
8892
androidGradlePlugin = { module = "com.android.tools.build:gradle", version.ref = "androidGradleVersion" }
8993
kotlinCompilerEmbeddable = { module = "org.jetbrains.kotlin:kotlin-compiler-embeddable", version.ref = "kotlinVersion" }
9094
detektGradlePlugin = { module = "io.gitlab.arturbosch.detekt:detekt-gradle-plugin", version.ref = "detektVersion" }
9195
mokoMultiplatformPlugin = { module = "dev.icerock:mobile-multiplatform", version.ref = "mokoMultiplatformPluginVersion" }
96+
composeJetBrainsPlugin = { module = "org.jetbrains.compose:compose-gradle-plugin", version.ref = "composeJetbrainsVersion" }
97+
autoManifestPlugin = { module = "com.gradleup:auto-manifest-plugin", version = "1.1.1" }
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-bin.zip
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists

resources-generator/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ version = libs.versions.mokoResourcesVersion.get()
1515

1616
dependencies {
1717
implementation(gradleKotlinDsl())
18-
compileOnly(libs.kotlinGradlePlugin)
18+
compileOnly(libs.kotlinGradlePluginNext)
1919
compileOnly(libs.androidGradlePlugin)
2020
implementation(libs.kotlinPoet)
2121
implementation(libs.kotlinxSerialization)

resources-generator/src/main/kotlin/dev/icerock/gradle/generator/apple/AppleMRGenerator.kt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ import org.jetbrains.kotlin.gradle.plugin.mpp.AbstractKotlinNativeCompilation
2828
import org.jetbrains.kotlin.gradle.plugin.mpp.Framework
2929
import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinNativeTarget
3030
import org.jetbrains.kotlin.gradle.plugin.mpp.TestExecutable
31-
import org.jetbrains.kotlin.gradle.plugin.mpp.apple.XCFrameworkTask
3231
import org.jetbrains.kotlin.gradle.tasks.FatFrameworkTask
3332
import org.jetbrains.kotlin.gradle.tasks.FrameworkDescriptor
3433
import org.jetbrains.kotlin.gradle.tasks.KotlinNativeCompile

0 commit comments

Comments
 (0)