Updated dependencies

sirekanian · Aug 16, 2023 · e7bfaec · e7bfaec
1 parent 12e3b5c
commit e7bfaec
Show file tree

Hide file tree

Showing 5 changed files with 33 additions and 23 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -1,29 +1,24 @@
 plugins {
     id 'com.android.application'
     id 'org.jetbrains.kotlin.android'
-    id 'org.jetbrains.kotlin.kapt'
     id 'org.jetbrains.kotlin.plugin.serialization'
+    id 'com.google.devtools.ksp'
     id 'org.sirekanyan.version-checker'
 }
 
 android {
     namespace "com.sirekanian.spacetime"
-    compileSdk 33
+    compileSdk 34
     defaultConfig {
         applicationId "com.sirekanian.spacetime"
         minSdk 21
-        targetSdk 33
+        targetSdk 34
         versionCode appVersionCode as int
         versionName appVersionName
         archivesBaseName = "$applicationId-$versionName-$versionCode"
         vectorDrawables {
             useSupportLibrary true
         }
-        javaCompileOptions {
-            annotationProcessorOptions {
-                arguments += ["room.schemaLocation": "$projectDir/schemas".toString()]
-            }
-        }
     }
     buildTypes {
         debug {
@@ -63,25 +58,35 @@ android {
     }
 }
 
+ksp {
+    arg('room.schemaLocation', "$projectDir/schemas")
+}
+
 dependencies {
 
     // compose
+    // noinspection GradleDependency https://issuetracker.google.com/issues/294562502
     implementation "androidx.compose.material:material:$composeLibraryVersion"
-    implementation "androidx.activity:activity-compose:1.7.1"
+    implementation "androidx.activity:activity-compose:1.7.2"
 
     // room
-    implementation "androidx.room:room-ktx:2.5.1"
-    kapt "androidx.room:room-compiler:2.5.1"
+    implementation "androidx.room:room-ktx:2.5.2"
+    ksp "androidx.room:room-compiler:2.5.2"
 
     // coil
-    implementation "io.coil-kt:coil-compose:2.3.0"
+    implementation "io.coil-kt:coil-compose:2.4.0"
 
     // datetime
     implementation 'org.jetbrains.kotlinx:kotlinx-datetime:0.4.0'
 
     // ktor
-    implementation 'io.ktor:ktor-client-android:2.3.0'
-    implementation 'io.ktor:ktor-client-content-negotiation:2.3.0'
-    implementation 'io.ktor:ktor-serialization-kotlinx-json:2.3.0'
+    implementation 'io.ktor:ktor-client-android:2.3.3'
+    implementation 'io.ktor:ktor-client-content-negotiation:2.3.3'
+    implementation 'io.ktor:ktor-serialization-kotlinx-json:2.3.3'
+
+}
 
+versionCheckerOptions {
+    // https://issuetracker.google.com/issues/294562502
+    lessThan("androidx.compose.material:material", "1.5.0")
 }
diff --git a/build.gradle b/build.gradle
@@ -1,17 +1,18 @@
 buildscript {
     ext {
-        androidPluginVersion = '8.0.0'
-        kotlinLanguageVersion = '1.8.20'
-        composeCompilerVersion = '1.4.6'
-        composeLibraryVersion = '1.4.2'
+        androidPluginVersion = '8.1.0'
+        kotlinLanguageVersion = '1.9.0'
+        composeCompilerVersion = '1.5.1'
+        composeLibraryVersion = '1.4.3'
     }
 }
 
 plugins {
     id 'com.android.application' version "$androidPluginVersion" apply false
     id 'org.jetbrains.kotlin.android' version "$kotlinLanguageVersion" apply false
     id 'org.jetbrains.kotlin.plugin.serialization' version "$kotlinLanguageVersion" apply false
-    id 'org.sirekanyan.version-checker' version "1.0.3" apply false
+    id 'com.google.devtools.ksp' version "$kotlinLanguageVersion-1.0.13" apply false
+    id 'org.sirekanyan.version-checker' version "1.0.7" apply false
 }
 
 task clean(type: Delete) {

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,7 +1,8 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionSha256Sum=e111cb9948407e26351227dabce49822fb88c37ee72f1d1582a69c68af2e702f
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip
+distributionSha256Sum=03ec176d388f2aa99defcadc3ac6adf8dd2bce5145a129659537c0874dea5ad1
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-bin.zip
 networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/gradlew b/gradlew
@@ -130,10 +130,13 @@ location of your Java installation."
     fi
 else
     JAVACMD=java
-    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+    if ! command -v java >/dev/null 2>&1
+    then
+        die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
 
 Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
+    fi
 fi
 
 # Increase the maximum file descriptors if we can.