Skip to content

Commit 278a44b

Browse files
XilinJiaLouisCAD
authored andcommitted
3.2.8 RC1
(cherry picked from commit da449255649a8ae21eb18a0b87fa2f8afbbc6e82)
1 parent fa20c1c commit 278a44b

File tree

3 files changed

+6
-4
lines changed

3 files changed

+6
-4
lines changed

CHANGELOG.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,10 @@
22

33
* updated Kotlin to 2.2.0
44
* fixed build errors due to deprecations in Kotlin 2.2.0
5-
* gradle upped to 8.13
5+
* gradle upped to 8.14.3
66
* fixed syntax errors in build.gradle.kts in cinterop related to kotlinOptions for Mac ans iOS
77
* fixed syntax errors in build.gradle.kts in cinterop related to KotlinCompile
8+
* fixed unknown jvmTarget issue when doing publish local
89
* various other dependencies updates suitable for Kotlin 2.2.0
910

1011
## 3.2.7

packages/gradle-plugin/src/main/kotlin/io/github/xilinjia/krdb/gradle/RealmCompilerSubplugin.kt

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ import io.github.xilinjia.krdb.gradle.analytics.ProjectConfiguration
2929
import io.github.xilinjia.krdb.gradle.analytics.TargetInfo
3030
import io.github.xilinjia.krdb.gradle.analytics.hexStringify
3131
import io.github.xilinjia.krdb.gradle.analytics.sha256Hash
32+
import java.io.File
3233
import org.gradle.api.Project
3334
import org.gradle.api.plugins.ExtensionAware
3435
import org.gradle.api.provider.Provider
@@ -52,7 +53,6 @@ import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinWithJavaCompilation
5253
import org.jetbrains.kotlin.konan.target.Architecture
5354
import org.jetbrains.kotlin.konan.target.Family
5455
import org.jetbrains.kotlin.konan.target.KonanTarget
55-
import java.io.File
5656

5757
internal val gradleVersion: GradleVersion = GradleVersion.current().baseVersion
5858
internal val gradle70: GradleVersion = GradleVersion.version("7.0")
@@ -295,7 +295,8 @@ private fun gatherTargetInfo(kotlinCompilation: KotlinCompilation<*>): TargetInf
295295
}
296296

297297
is KotlinJvmCompilation -> {
298-
val jvmTarget = kotlinCompilation.kotlinOptions.jvmTarget
298+
// val jvmTarget = kotlinCompilation.kotlinOptions.jvmTarget
299+
val jvmTarget = kotlinCompilation.target.compilerOptions.jvmTarget.orNull?.target
299300
TargetInfo("JVM", "Universal", jvmTarget, jvmTarget)
300301
}
301302

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-8.12-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists

0 commit comments

Comments
 (0)