Update Fruitties to Kotlin 2.0.10 (#28)

* Kotlin 2.0.10
* Add `.kotlin` to `.gitignore`
* Room 2.7.0-alpha06
  * https://developer.android.com/jetpack/androidx/releases/room#2.7.0-alpha06
  * https://developer.android.com/kotlin/multiplatform/room#defining-database
* Gradle wrapper 8.10
  * ./gradlew wrapper --gradle-version latest
* Various library version bumps
  * Android Gradle plugin 8.5.2
  * SQLite to 2.5.0-alpha06

Author: cartland

Fruitties/.gitignore

@@ -7,4 +7,5 @@ captures
 .externalNativeBuild
 .cxx
 local.properties
-xcuserdata
+xcuserdata
+.kotlin

Fruitties/androidApp/build.gradle.kts

@@ -16,6 +16,7 @@
 plugins {
     alias(libs.plugins.androidApplication)
     alias(libs.plugins.kotlinAndroid)
+    alias(libs.plugins.compose.compiler)
 }
 
 android {
@@ -31,9 +32,6 @@ android {
     buildFeatures {
         compose = true
     }
-    composeOptions {
-        kotlinCompilerExtensionVersion = libs.versions.compose.compiler.get()
-    }
     packaging {
         resources {
             excludes += "/META-INF/{AL2.0,LGPL2.1}"

Fruitties/build.gradle.kts

@@ -15,19 +15,20 @@
  */
 plugins {
     //trick: for the same plugin versions in all sub-modules
-    alias(libs.plugins.androidApplication).apply(false)
-    alias(libs.plugins.androidLibrary).apply(false)
-    alias(libs.plugins.kotlinAndroid).apply(false)
-    alias(libs.plugins.kotlinMultiplatform).apply(false)
-    alias(libs.plugins.spotless).apply(false)
+    alias(libs.plugins.androidApplication) apply false
+    alias(libs.plugins.androidLibrary) apply false
+    alias(libs.plugins.kotlinAndroid) apply false
+    alias(libs.plugins.kotlinMultiplatform) apply false
+    alias(libs.plugins.compose.compiler) apply false
+    alias(libs.plugins.spotless) apply false
 }
 
 subprojects {
     apply(plugin = "com.diffplug.spotless")
     configure<com.diffplug.gradle.spotless.SpotlessExtension> {
         kotlin {
             target("**/*.kt")
-            targetExclude("$buildDir/**/*.kt")
+            targetExclude("${layout.buildDirectory}/**/*.kt")
 
             ktlint()
             //licenseHeaderFile(rootProject.file("spotless/copyright.kt"))

Fruitties/gradle/libs.versions.toml

@@ -1,25 +1,35 @@
+# Copyright 2024 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
 [versions]
-agp = "8.2.0"
-androidx-activityCompose = "1.8.2"
-androidx-paging = "3.3.0-rc01"
-androidx-room = "2.7.0-alpha01"
-androidx-viewmodelCompose = "2.7.0"
+agp = "8.5.2"
+androidx-activityCompose = "1.9.1"
+androidx-paging = "3.3.2"
+androidx-room = "2.7.0-alpha06"
+androidx-viewmodelCompose = "2.8.4"
 atomicfu = "0.23.1"
-compose = "1.6.5"
-compose-compiler = "1.5.11"
+compose = "1.6.8"
 compose-material3 = "1.2.1"
-compose-plugin = "1.6.0"
 dataStoreVersion = "1.1.1"
-kotlin = "1.9.23"
+kotlin = "2.0.10"
 kotlinx-coroutines = "1.8.0"
 kotlinxDatetime = "0.6.0-RC.2"
-ksp = "1.9.23-1.0.19"
+ksp = "2.0.10-1.0.24"
 ktorVersion = "2.3.8"
-material3Android = "1.2.1"
-pagingComposeAndroid = "3.3.0-beta01"
-roomKtx = "2.6.1"
-skie = "0.6.2"
-sqlite = "2.5.0-SNAPSHOT"
+pagingComposeAndroid = "3.3.2"
+skie = "0.8.4"
+sqlite = "2.5.0-alpha06"
 spotless = "6.19.0"
 
 [libraries]
@@ -29,9 +39,8 @@ androidx-datastore-preferences-core = { group = "androidx.datastore", name = "da
 androidx-paging-common = { module = "androidx.paging:paging-common", version.ref = "androidx-paging" }
 androidx-paging-compose-android = { group = "androidx.paging", name = "paging-compose-android", version.ref = "pagingComposeAndroid" }
 androidx-room-compiler = { group = "androidx.room", name = "room-compiler", version.ref = "androidx-room" }
-androidx-room-ktx = { group = "androidx.room", name = "room-ktx", version.ref = "androidx-room" }
-androidx-room-paging = { group = "androidx.room", name = "room-paging", version.ref = "androidx-room" }
 androidx-room-runtime = { group = "androidx.room", name = "room-runtime", version.ref = "androidx-room" }
+androidx-room-paging = { group = "androidx.room", name = "room-paging", version.ref = "androidx-room" }
 androidx-viewmodel-compose = { module = "androidx.lifecycle:lifecycle-viewmodel-compose", version.ref = "androidx-viewmodelCompose" }
 compose-foundation = { module = "androidx.compose.foundation:foundation", version.ref = "compose" }
 compose-material3 = { module = "androidx.compose.material3:material3", version.ref = "compose-material3" }
@@ -61,6 +70,8 @@ kotlinAndroid = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
 kotlinMultiplatform = { id = "org.jetbrains.kotlin.multiplatform", version.ref = "kotlin" }
 kotlinCocoapods = { id = "org.jetbrains.kotlin.native.cocoapods", version.ref = "kotlin" }
 kotlinxSerialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin" }
+org-jetbrains-kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
+compose-compiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }
 skie = { id = "co.touchlab.skie", version.ref = "skie" }
 ksp = { id = "com.google.devtools.ksp", version.ref = "ksp" }
 room = { id = "androidx.room", version.ref = "androidx-room" }

Fruitties/gradle/wrapper/gradle-wrapper.jar

@@ -1,6 +1,7 @@
-#Wed Apr 10 15:24:21 PDT 2024
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.10-bin.zip
+networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists