Upgrade gradle and cleanup (#21)

Luna712 · web-flow · commit f3b21f42fee1 · 2025-01-12T11:40:53.000+01:00
* Upgrade gradle and cleanup

* Fix namespace

* Replace apk

* Cleanup

* Cleanup

* Cleanup
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -32,10 +32,10 @@ jobs:
       - name: Clean old builds
         run: rm $GITHUB_WORKSPACE/builds/*.cs3 || true
 
-      - name: Setup JDK 11
+      - name: Setup JDK 17
         uses: actions/setup-java@v1
         with:
-          java-version: 11
+          java-version: 17
 
       - name: Setup Android SDK
         uses: android-actions/setup-android@v2
diff --git a/DailymotionProvider/build.gradle.kts b/DailymotionProvider/build.gradle.kts
@@ -1,24 +1,21 @@
-// use an integer for version numbers
+// Use an integer for version numbers
 version = 1
 
 cloudstream {
-    // All of these properties are optional, you can safely remove them
+    // All of these properties are optional, you can safely remove any of them.
 
     description = "Watch content from Dailymotion"
     authors = listOf("Luna712")
 
     /**
-     * Status int as the following:
+     * Status int as one of the following:
      * 0: Down
      * 1: Ok
      * 2: Slow
-     * 3: Beta only
-     * */
-    status = 1 // will be 3 if unspecified
+     * 3: Beta-only
+     **/
+    status = 1 // Will be 3 if unspecified
 
-    // List of video source types. Users are able to filter for extensions in a given category.
-    // You can find a list of available types here:
-    // https://recloudstream.github.io/cloudstream/html/app/com.lagradost.cloudstream3/-tv-type/index.html
     tvTypes = listOf("Others")
     iconUrl = "https://www.google.com/s2/favicons?domain=www.dailymotion.com&sz=%size%"
 }
diff --git a/DailymotionProvider/src/main/AndroidManifest.xml b/DailymotionProvider/src/main/AndroidManifest.xml
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest package="com.example"/>
+<manifest />
diff --git a/InvidiousProvider/build.gradle.kts b/InvidiousProvider/build.gradle.kts
@@ -1,24 +1,21 @@
-// use an integer for version numbers
+// Use an integer for version numbers
 version = 6
 
 cloudstream {
-    // All of these properties are optional, you can safely remove them
+    // All of these properties are optional, you can safely remove any of them.
 
     description = "Watch content from any invidious instance"
     authors = listOf("Cloudburst")
 
     /**
-    * Status int as the following:
+    * Status int as one of the following:
     * 0: Down
     * 1: Ok
     * 2: Slow
-    * 3: Beta only
-    * */
-    status = 1 // will be 3 if unspecified
+    * 3: Beta-only
+    **/
+    status = 1 // Will be 3 if unspecified
 
-    // List of video source types. Users are able to filter for extensions in a given category.
-    // You can find a list of available types here:
-    // https://recloudstream.github.io/cloudstream/html/app/com.lagradost.cloudstream3/-tv-type/index.html
     tvTypes = listOf("Others")
     iconUrl = "https://www.google.com/s2/favicons?domain=invidious.io&sz=%size%"
 }
diff --git a/InvidiousProvider/src/main/AndroidManifest.xml b/InvidiousProvider/src/main/AndroidManifest.xml
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest package="com.example"/>
+<manifest />
diff --git a/TwitchProvider/build.gradle.kts b/TwitchProvider/build.gradle.kts
@@ -1,24 +1,21 @@
-// use an integer for version numbers
+// Use an integer for version numbers
 version = 1
 
 cloudstream {
-    // All of these properties are optional, you can safely remove them
+    // All of these properties are optional, you can safely remove any of them.
 
     description = "Watch livestreams from Twitch"
     authors = listOf("CranberrySoup")
 
     /**
-    * Status int as the following:
+    * Status int as one of the following:
     * 0: Down
     * 1: Ok
     * 2: Slow
-    * 3: Beta only
-    * */
-    status = 1 // will be 3 if unspecified
+    * 3: Beta-only
+    **/
+    status = 1 // Will be 3 if unspecified
 
-    // List of video source types. Users are able to filter for extensions in a given category.
-    // You can find a list of available types here:
-    // https://recloudstream.github.io/dokka/-cloudstream/com.lagradost.cloudstream3/-tv-type/index.html
     tvTypes = listOf("Live")
     iconUrl = "https://www.google.com/s2/favicons?domain=twitch.tv&sz=%size%"
 }
diff --git a/TwitchProvider/src/main/AndroidManifest.xml b/TwitchProvider/src/main/AndroidManifest.xml
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest package="com.example"/>
+<manifest />
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -1,5 +1,7 @@
-import com.lagradost.cloudstream3.gradle.CloudstreamExtension 
 import com.android.build.gradle.BaseExtension
+import com.lagradost.cloudstream3.gradle.CloudstreamExtension
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
+import org.jetbrains.kotlin.gradle.tasks.KotlinJvmCompile
 
 buildscript {
     repositories {
@@ -10,10 +12,10 @@ buildscript {
     }
 
     dependencies {
-        classpath("com.android.tools.build:gradle:7.0.4")
+        classpath("com.android.tools.build:gradle:8.7.3")
         // Cloudstream gradle plugin which makes everything work and builds plugins
         classpath("com.github.recloudstream:gradle:-SNAPSHOT")
-        classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.21")
+        classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:2.1.0")
     }
 }
 
@@ -41,45 +43,47 @@ subprojects {
     }
 
     android {
+        namespace = "recloudstream"
+
         defaultConfig {
             minSdk = 21
-            compileSdkVersion(33)
-            targetSdk = 33
+            compileSdkVersion(35)
+            targetSdk = 35
         }
 
         compileOptions {
             sourceCompatibility = JavaVersion.VERSION_1_8
             targetCompatibility = JavaVersion.VERSION_1_8
         }
 
-        tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile> {
-            kotlinOptions {
-                jvmTarget = "1.8" // Required
-                // Disables some unnecessary features
-                freeCompilerArgs = freeCompilerArgs +
-                        "-Xno-call-assertions" +
-                        "-Xno-param-assertions" +
-                        "-Xno-receiver-assertions"
+        tasks.withType<KotlinJvmCompile> {
+            compilerOptions {
+                jvmTarget.set(JvmTarget.JVM_1_8) // Required
+                freeCompilerArgs.addAll(
+                    "-Xno-call-assertions",
+                    "-Xno-param-assertions",
+                    "-Xno-receiver-assertions"
+                )
             }
         }
     }
 
     dependencies {
-        val apk by configurations
+        val cloudstream by configurations
         val implementation by configurations
 
-        // Stubs for all Cloudstream classes
-        apk("com.lagradost:cloudstream3:pre-release")
+        // Stubs for all cloudstream classes
+        cloudstream("com.lagradost:cloudstream3:pre-release")
 
-        // these dependencies can include any of those which are added by the app,
-        // but you dont need to include any of them if you dont need them
-        // https://github.com/recloudstream/cloudstream/blob/master/app/build.gradle
-        implementation(kotlin("stdlib")) // adds standard kotlin features, like listOf, mapOf etc
-        implementation("com.github.Blatzar:NiceHttp:0.4.11") // http library
-        implementation("org.jsoup:jsoup:1.16.2") // html parser
+        // These dependencies can include any of those which are added by the app,
+        // but you don't need to include any of them if you don't need them.
+        // https://github.com/recloudstream/cloudstream/blob/master/app/build.gradle.kts
+        implementation(kotlin("stdlib")) // Adds Standard Kotlin Features
+        implementation("com.github.Blatzar:NiceHttp:0.4.11") // HTTP Lib
+        implementation("org.jsoup:jsoup:1.18.3") // HTML Parser
     }
 }
 
 task<Delete>("clean") {
-    delete(rootProject.buildDir)
-}
+    delete(rootProject.layout.buildDirectory)
+}
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,5 @@
-#Sun Feb 20 16:26:11 CET 2022
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-bin.zip
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -1,6 +1,7 @@
 rootProject.name = "CloudstreamPlugins"
 
-// This file sets what projects are included. All new projects should get automatically included unless specified in "disabled" variable.
+// This file sets what projects are included.
+// All new projects should get automatically included unless specified in the "disabled" variable.
 
 val disabled = listOf<String>()
 
@@ -14,6 +15,5 @@ fun File.eachDir(block: (File) -> Unit) {
     listFiles()?.filter { it.isDirectory }?.forEach { block(it) }
 }
 
-
 // To only include a single project, comment out the previous lines (except the first one), and include your plugin like so:
-// include("PluginName")
+// include("PluginName")

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`	`1`	`<?xml version="1.0" encoding="utf-8"?>`
`2`		`-<manifest package="com.example"/>`
	`2`	`+<manifest />`