From 6db295a799e0dfcc65f34c5b191a57d7f86cf016 Mon Sep 17 00:00:00 2001
From: Luna712 <142361265+Luna712@users.noreply.github.com>
Date: Sat, 11 Nov 2023 09:30:36 -0700
Subject: [PATCH] Upgrade gradle (#726)

---
 .idea/gradle.xml                         |  1 +
 app/build.gradle.kts                     | 16 ++++++++--------
 build.gradle.kts                         |  9 ++++-----
 gradle/wrapper/gradle-wrapper.properties |  2 +-
 4 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index a8a2961a..c5c0ff3b 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -8,6 +8,7 @@
         <option name="testRunner" value="GRADLE" />
         <option name="distributionType" value="DEFAULT_WRAPPED" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
+        <option name="gradleJvm" value="jbr-17" />
         <option name="modules">
           <set>
             <option value="$PROJECT_DIR$" />
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 12859af5..67dd8ad4 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -1,5 +1,6 @@
 import com.android.build.gradle.internal.cxx.configure.gradleLocalProperties
 import org.jetbrains.dokka.gradle.DokkaTask
+import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 import java.io.ByteArrayOutputStream
 import java.net.URL
 
@@ -133,10 +134,6 @@ android {
             versionCode = (System.currentTimeMillis() / 60000).toInt()
         }
     }
-    //toolchain {
-    //     languageVersion.set(JavaLanguageVersion.of(17))
-    // }
-    // jvmToolchain(17)
 
     compileOptions {
         isCoreLibraryDesugaringEnabled = true
@@ -144,10 +141,6 @@ android {
         sourceCompatibility = JavaVersion.VERSION_1_8
         targetCompatibility = JavaVersion.VERSION_1_8
     }
-    kotlinOptions {
-        jvmTarget = "1.8"
-        freeCompilerArgs = listOf("-Xjvm-default=compatibility")
-    }
     lint {
         abortOnError = false
         checkReleaseBuilds = false
@@ -286,6 +279,13 @@ tasks.register("makeJar", Copy::class) {
     dependsOn("build")
 }
 
+tasks.withType<KotlinCompile> {
+    kotlinOptions {
+        jvmTarget = "1.8"
+        freeCompilerArgs = listOf("-Xjvm-default=all-compatibility")
+    }
+}
+
 tasks.withType<DokkaTask>().configureEach {
     moduleName.set("Cloudstream")
     dokkaSourceSets {
diff --git a/build.gradle.kts b/build.gradle.kts
index 5d7ea527..16cfb68f 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -5,10 +5,9 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        // we stay on low ver because prerelease build gradle is fucked
-        classpath("com.android.tools.build:gradle:7.3.1")
-        classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.8.20")
-        classpath("org.jetbrains.dokka:dokka-gradle-plugin:1.5.0")
+        classpath("com.android.tools.build:gradle:8.1.3")
+        classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.20")
+        classpath("org.jetbrains.dokka:dokka-gradle-plugin:1.9.10")
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle.kts files
@@ -23,7 +22,7 @@ allprojects {
 }
 
 plugins {
-    id("com.google.devtools.ksp") version "1.8.20-1.0.11" apply false
+    id("com.google.devtools.ksp") version "1.9.20-1.0.14" apply false
 }
 
 tasks.register("clean", Delete::class) {
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index baa28c97..d7c9c9bc 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 #Fri Apr 30 17:11:15 CEST 2021
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.1-bin.zip
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME