From f48c78d3ace8e091ca5c1c277007cf0d38c811ea Mon Sep 17 00:00:00 2001
From: Pranav Purwar <purwarpranav80@gmail.com>
Date: Fri, 7 Jun 2024 22:14:20 +0530
Subject: [PATCH] chore: Update dependencies

Tested-by: Pranav Purwar <purwarpranav80@gmail.com>
Signed-off-by: PranavPurwar <purwarpranav80@gmail.com>
Signed-off-by: Pranav Purwar <purwarpranav80@gmail.com>
---
 .idea/.gitignore                         |  2 ++
 .idea/kotlinc.xml                        |  2 +-
 app/build.gradle.kts                     | 24 ++++++++++++------------
 build-tools/build.gradle.kts             |  7 -------
 build.gradle.kts                         |  8 ++++----
 feature/aliuhook/build.gradle.kts        |  2 ++
 gradle/wrapper/gradle-wrapper.properties |  2 +-
 7 files changed, 22 insertions(+), 25 deletions(-)

diff --git a/.idea/.gitignore b/.idea/.gitignore
index 26d33521a..8f00030d5 100644
--- a/.idea/.gitignore
+++ b/.idea/.gitignore
@@ -1,3 +1,5 @@
 # Default ignored files
 /shelf/
 /workspace.xml
+# GitHub Copilot persisted chat sessions
+/copilot/chatSessions
diff --git a/.idea/kotlinc.xml b/.idea/kotlinc.xml
index 3de8060b7..0f8e1ca73 100644
--- a/.idea/kotlinc.xml
+++ b/.idea/kotlinc.xml
@@ -4,6 +4,6 @@
     <option name="jvmTarget" value="17" />
   </component>
   <component name="KotlinJpsPluginSettings">
-    <option name="version" value="2.0.0-Beta5" />
+    <option name="version" value="2.0.0" />
   </component>
 </project>
\ No newline at end of file
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index a7c200987..785a58d18 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -178,26 +178,26 @@ configurations.all {
 
 dependencies {
     implementation("com.android.tools:r8:8.3.37")
-    implementation("com.android.tools.smali:smali-dexlib2:3.0.5")
+    implementation("com.android.tools.smali:smali-dexlib2:3.0.7")
 
     //noinspection GradleDependency
     implementation("com.github.Cosmic-Ide:DependencyResolver:868996895a")
-    implementation("com.google.android.material:material:1.12.0-beta01")
+    implementation("com.google.android.material:material:1.12.0")
     implementation("com.google.code.gson:gson:2.10.1")
 
     implementation("com.github.haroldadmin:WhatTheStack:1.0.0-alpha04")
 
-    implementation("androidx.appcompat:appcompat:1.7.0-alpha03")
+    implementation("androidx.appcompat:appcompat:1.7.0")
     implementation("androidx.constraintlayout:constraintlayout:2.2.0-alpha13")
-    implementation("androidx.core:core-ktx:1.13.0-beta01")
-    implementation("androidx.core:core-splashscreen:1.1.0-alpha02")
+    implementation("androidx.core:core-ktx:1.13.1")
+    implementation("androidx.core:core-splashscreen:1.1.0-rc01")
     implementation("androidx.documentfile:documentfile:1.1.0-alpha01")
-    implementation("androidx.fragment:fragment-ktx:1.7.0-beta01")
-    implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.8.0-alpha03")
-    implementation("androidx.lifecycle:lifecycle-viewmodel-ktx:2.8.0-alpha03")
+    implementation("androidx.fragment:fragment-ktx:1.7.1")
+    implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.8.1")
+    implementation("androidx.lifecycle:lifecycle-viewmodel-ktx:2.8.1")
     implementation("androidx.swiperefreshlayout:swiperefreshlayout:1.2.0-alpha01")
-    implementation("androidx.viewpager2:viewpager2:1.1.0-rc01")
-    implementation("androidx.activity:activity-ktx:1.9.0-beta01")
+    implementation("androidx.viewpager2:viewpager2:1.1.0")
+    implementation("androidx.activity:activity-ktx:1.9.0")
     implementation("androidx.startup:startup-runtime:1.2.0-alpha02")
 
     val editorVersion = "0.23.4-cac2770-SNAPSHOT"
@@ -230,7 +230,7 @@ dependencies {
     implementation("org.lsposed.hiddenapibypass:hiddenapibypass:4.3")
     implementation("org.slf4j:slf4j-simple:2.1.0-alpha1")
 
-    implementation("com.google.ai.client.generativeai:generativeai:0.2.2")
+    implementation("com.google.ai.client.generativeai:generativeai:0.7.0")
 
     val shizukuVersion = "13.1.5"
     implementation("dev.rikka.shizuku:api:$shizukuVersion")
@@ -255,7 +255,7 @@ dependencies {
     implementation(projects.feature.editorTextmate)
 
     // jgit uses some methods like `transferTo` are only available from Android 13 onwards
-    coreLibraryDesugaring("com.android.tools:desugar_jdk_libs_nio:2.0.4")
+    coreLibraryDesugaring("com.android.tools:desugar_jdk_libs:2.0.4")
 
     testImplementation("junit:junit:4.13.2")
 }
diff --git a/build-tools/build.gradle.kts b/build-tools/build.gradle.kts
index 806679885..a18933558 100644
--- a/build-tools/build.gradle.kts
+++ b/build-tools/build.gradle.kts
@@ -52,13 +52,6 @@ dependencies {
     implementation(projects.feature.project)
     implementation(projects.util)
     implementation(projects.feature.javaCompletion)
-    /* D8 cannot handle scala3 compiler rn (https://issuetracker.google.com/issues/285036373)
-    implementation("org.scala-lang:scala3-compiler_3:3.3.1-RC1") {
-        exclude(group = "org.jline", module = "jline-terminal")
-        exclude(group = "org.jline", module = "jline-terminal-jna")
-        exclude(group = "org.jline", module = "jline-reader")
-    }
-    */
     implementation("com.github.Cosmic-Ide.kotlinc-android:kotlinc:2a0a6a7291")
     implementation("io.github.Rosemoe.sora-editor:editor:0.23.4-cac2770-SNAPSHOT")
     implementation("io.github.itsaky:nb-javac-android:17.0.0.3")
diff --git a/build.gradle.kts b/build.gradle.kts
index 026cecbed..18d245107 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -7,10 +7,10 @@
 
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 plugins {
-    id("com.android.application") version "8.4.0-alpha03" apply false
-    id("com.android.library") version "8.5.0-alpha07" apply false
-    id("org.jetbrains.kotlin.android") version "2.0.0-Beta5" apply false
-    id("org.jetbrains.kotlin.jvm") version "2.0.0-Beta5" apply false
+    id("com.android.application") version "8.6.0-alpha04" apply false
+    id("com.android.library") version "8.6.0-alpha04" apply false
+    id("org.jetbrains.kotlin.android") version "2.0.0" apply false
+    id("org.jetbrains.kotlin.jvm") version "2.0.0" apply false
     id("dev.rikka.tools.materialthemebuilder") version "1.4.1" apply false
 }
 
diff --git a/feature/aliuhook/build.gradle.kts b/feature/aliuhook/build.gradle.kts
index 223fe0522..e53a58d90 100644
--- a/feature/aliuhook/build.gradle.kts
+++ b/feature/aliuhook/build.gradle.kts
@@ -34,6 +34,8 @@ android {
         }
     }
 
+    ndkVersion = "27.0.11902837"
+
     compileOptions {
         sourceCompatibility = JavaVersion.VERSION_17
         targetCompatibility = JavaVersion.VERSION_17
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index b97bde2c8..b82aa23a4 100644
--- 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.7-rc-4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME