Use Kotlin 2.0.0

tidal-music · May 21, 2024 · ebecaee · ebecaee
1 parent bbf8aeb
commit ebecaee
Show file tree

Hide file tree

Showing 8 changed files with 27 additions and 15 deletions.
diff --git a/.idea/artifacts/networktime_jvm.xml b/.idea/artifacts/networktime_jvm.xml
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -4,11 +4,12 @@ buildscript {
     google()
   }
   dependencies {
-    val kotlinVersion = "1.9.23"
+    val kotlinVersion = "2.0.0"
     classpath(kotlin("gradle-plugin", version = kotlinVersion))
     classpath(kotlin("serialization", version = kotlinVersion))
-    classpath("com.android.tools.build:gradle:8.1.4")
-    classpath("org.jetbrains.compose:compose-gradle-plugin:1.6.1")
+    classpath("com.android.tools.build:gradle:8.4.1")
+    classpath("org.jetbrains.compose:compose-gradle-plugin:1.6.10")
+    classpath("org.jetbrains.kotlin:compose-compiler-gradle-plugin:$kotlinVersion")
   }
 }
 

diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 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-8.7-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

diff --git a/gradlew.bat b/gradlew.bat
@@ -43,11 +43,11 @@ set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
 if %ERRORLEVEL% equ 0 goto execute
 
-echo.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo. 1>&2
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
 
 goto fail
 
@@ -57,11 +57,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
 if exist "%JAVA_EXE%" goto execute
 
-echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo. 1>&2
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
 
 goto fail
 

diff --git a/samples/multiplatform-kotlin/android/build.gradle.kts b/samples/multiplatform-kotlin/android/build.gradle.kts
@@ -2,6 +2,7 @@ plugins {
   kotlin("multiplatform")
   id("org.jetbrains.compose")
   id("com.android.application")
+  id("org.jetbrains.kotlin.plugin.compose")
 }
 
 kotlin {

diff --git a/samples/multiplatform-kotlin/jvm/build.gradle.kts b/samples/multiplatform-kotlin/jvm/build.gradle.kts
@@ -3,6 +3,7 @@ import org.jetbrains.compose.desktop.application.dsl.TargetFormat
 plugins {
   kotlin("multiplatform")
   id("org.jetbrains.compose")
+  id("org.jetbrains.kotlin.plugin.compose")
 }
 
 kotlin {

diff --git a/samples/multiplatform-kotlin/shared/build.gradle.kts b/samples/multiplatform-kotlin/shared/build.gradle.kts
@@ -1,6 +1,7 @@
 plugins {
   kotlin("multiplatform")
   id("org.jetbrains.compose")
+  id("org.jetbrains.kotlin.plugin.compose")
 }
 
 kotlin {
@@ -14,7 +15,9 @@ kotlin {
   ).forEach {
     it.binaries.framework {
       baseName = project.name
-      binaryOption("bundleId", "com.tidal.networktime.sample-${it.targetName}")
+      binaryOption("bundleId", "TidalNetworkTimeSample")
+      binaryOption("bundleShortVersionString", version as String)
+      binaryOption("bundleVersion", version as String)
     }
   }