Update Kotlin (1.7.10), NDK (25.0.8775105), AGP (7.2.2) and Kotlin deps

PabloG02 · Aug 17, 2022 · 39f398f · 39f398f
1 parent e9618d9
commit 39f398f
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 13 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -42,7 +42,7 @@ jobs:
           ln -s /usr/bin/ninja .
 
       - name: Install CMake & Android NDK
-        run: echo "yes" | $ANDROID_HOME/tools/bin/sdkmanager "cmake;3.18.1" "ndk;25.0.8221429" --channel=3 | grep -v = || true
+        run: echo "yes" | $ANDROID_HOME/tools/bin/sdkmanager "cmake;3.22.1" "ndk;25.0.8775105" --channel=3 | grep -v = || true
 
       - name: Decode Keystore
         if: ${{ env.IS_SKYLINE_SIGNED == 'true' }}

diff --git a/app/build.gradle b/app/build.gradle
@@ -8,7 +8,7 @@ plugins {
 }
 
 idea.module {
-    // These are not viable to index on most systems to exclude them to prevent IDE crashes
+    // These are not viable to index on most systems so exclude them to prevent IDE crashes
     excludeDirs.add(file("libraries/boost"))
     excludeDirs.add(file("libraries/llvm"))
 }
@@ -91,10 +91,10 @@ android {
     }
 
     /* NDK and CMake */
-    ndkVersion '25.0.8221429'
+    ndkVersion '25.0.8775105'
     externalNativeBuild {
         cmake {
-            version '3.18.1+'
+            version '3.22.1+'
             path "CMakeLists.txt"
         }
     }
@@ -116,16 +116,16 @@ android {
 
 dependencies {
     /* Google  */
-    implementation 'androidx.core:core-ktx:1.7.0'
-    implementation 'androidx.appcompat:appcompat:1.4.1'
-    implementation 'androidx.constraintlayout:constraintlayout:2.1.3'
+    implementation 'androidx.core:core-ktx:1.8.0'
+    implementation 'androidx.appcompat:appcompat:1.5.0'
+    implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
     implementation 'androidx.preference:preference-ktx:1.2.0'
-    implementation 'com.google.android.material:material:1.5.0'
+    implementation 'com.google.android.material:material:1.6.1'
     implementation 'androidx.documentfile:documentfile:1.0.1'
     implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.1.0'
     implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:$lifecycle_version"
     implementation "androidx.lifecycle:lifecycle-livedata-ktx:$lifecycle_version"
-    implementation 'androidx.fragment:fragment-ktx:1.4.1'
+    implementation 'androidx.fragment:fragment-ktx:1.5.2'
     implementation "com.google.dagger:hilt-android:$hilt_version"
     kapt "com.google.dagger:hilt-android-compiler:$hilt_version"
     implementation 'com.google.android.flexbox:flexbox:3.0.0'

diff --git a/build.gradle b/build.gradle
@@ -2,18 +2,19 @@
 
 buildscript {
     ext {
-        kotlin_version = '1.6.21'
+        kotlin_version = '1.7.10'
         serialization_version = '1.3.3'
-        lifecycle_version = '2.4.1'
-        hilt_version = '2.41'
+        lifecycle_version = '2.5.1'
+        hilt_version = '2.43.2'
     }
 
     repositories {
         google()
         mavenCentral()
     }
+
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.1.3'
+        classpath 'com.android.tools.build:gradle:7.2.2'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         classpath "com.google.dagger:hilt-android-gradle-plugin:$hilt_version"