Merge pull request EventFahrplan#670 from EventFahrplan/project-updates

Update project setup (kotlin 2.0.0, Compose Compiler plugin 2.0.0, AGP 8.5.1, Gradle wrapper 8.9, truth 1.4.4, mockito-kotlin 5.4.0).

app/build.gradle

@@ -7,6 +7,7 @@ ext.set("APP_VERSION", "${gitSha()}")
 
 apply plugin: "com.android.application"
 apply plugin: "kotlin-android"
+apply plugin: "org.jetbrains.kotlin.plugin.compose"
 apply plugin: "com.google.devtools.ksp"
 apply plugin: "de.mobilej.unmock"
 apply plugin: "com.getkeepsafe.dexcount"
@@ -57,10 +58,6 @@ android {
         compose true
     }
 
-    composeOptions {
-        kotlinCompilerExtensionVersion = Compose.Versions.compiler
-    }
-
     buildTypes {
         debug {
             versionNameSuffix "-DEBUG"

build.gradle

@@ -10,6 +10,7 @@ buildscript {
     }
     dependencies {
         classpath Plugins.android
+        classpath Plugins.composeCompiler
         classpath Plugins.dexcount
         classpath Plugins.kotlin
         classpath Plugins.ksp

buildSrc/src/main/kotlin/nerd/tuxmobil/fahrplan/congress/Dependencies.kt

@@ -17,9 +17,8 @@ object Android {
 
 object Compose {
 
-    object Versions {
-        internal const val bom = "2024.06.00"
-        const val compiler = "1.5.14"
+    private object Versions {
+        const val bom = "2024.06.00"
     }
 
     const val bom = "androidx.compose:compose-bom:${Versions.bom}"
@@ -32,16 +31,17 @@ object Compose {
 object Plugins {
 
     private object Versions {
-        const val android = "8.5.0"
+        const val android = "8.5.1"
         const val dexcount = "4.0.0"
-        const val kotlin = "1.9.24"
-        const val ksp = "1.9.24-1.0.20"
+        const val kotlin = "2.0.0"
+        const val ksp = "2.0.0-1.0.23"
         const val sonarQube = "5.0.0.4638"
         const val unMock = "0.7.9"
         const val versions = "0.51.0"
     }
 
     const val android = "com.android.tools.build:gradle:${Versions.android}"
+    const val composeCompiler = "org.jetbrains.kotlin:compose-compiler-gradle-plugin:${Versions.kotlin}"
     const val dexcount = "com.getkeepsafe.dexcount:dexcount-gradle-plugin:${Versions.dexcount}"
     const val kotlin = "org.jetbrains.kotlin:kotlin-gradle-plugin:${Versions.kotlin}"
     const val ksp = "com.google.devtools.ksp:com.google.devtools.ksp.gradle.plugin:${Versions.ksp}"
@@ -62,13 +62,13 @@ object Libs {
         const val coreTesting = "2.2.0"
         const val emailIntentBuilder = "2.0.0"
         const val engelsystem = "9.1.0"
-        const val junitJupiter = "5.10.2"
+        const val junitJupiter = "5.10.3"
         const val kotlinCoroutines = "1.8.1"
-        const val lifecycle = "2.8.2"
+        const val lifecycle = "2.8.3"
         const val markwon = "4.6.2"
         const val material = "1.12.0"
         const val mockito = "5.12.0"
-        const val mockitoKotlin = "5.3.1"
+        const val mockitoKotlin = "5.4.0"
         const val moshi = "1.15.1"
         const val okhttp = "4.12.0"
         const val preference = "1.2.1"
@@ -77,7 +77,7 @@ object Libs {
         const val snackengage = "0.30"
         const val threeTenBp = "1.6.9"
         const val tracedroid = "3.1"
-        const val truth = "1.4.2"
+        const val truth = "1.4.4"
         const val turbine = "1.1.0"
     }
 

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-all.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

gradlew

@@ -15,6 +15,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
+# SPDX-License-Identifier: Apache-2.0
+#
 
 ##############################################################################
 #
@@ -84,7 +86,8 @@ done
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
 # Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
-APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
+APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
+' "$PWD" ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum

gradlew.bat

@@ -13,6 +13,8 @@
 @rem See the License for the specific language governing permissions and
 @rem limitations under the License.
 @rem
+@rem SPDX-License-Identifier: Apache-2.0
+@rem
 
 @if "%DEBUG%"=="" @echo off
 @rem ##########################################################################