Merge pull request #61 from Stremio/bump-gradle-deps

chore(stremio-core-kotlin): bump gradle dependencies
Stremio · Nov 7, 2024 · 5578545 · 5578545
2 parents e8631be + ecf8c10
commit 5578545
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 47 deletions.
diff --git a/stremio-core-kotlin/build.gradle.kts b/stremio-core-kotlin/build.gradle.kts
@@ -1,6 +1,4 @@
-import com.android.build.api.dsl.AndroidSourceSet
 import com.google.protobuf.gradle.*
-import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 group = "com.github.Stremio"
 version = "1.3.0"
@@ -13,50 +11,32 @@ allprojects {
 }
 
 plugins {
-  kotlin("multiplatform") version "1.8.0"
-  id("maven-publish")
-  id("com.android.library") version "7.2.2"
+  kotlin("multiplatform") version "1.9.25"
   id("org.mozilla.rust-android-gradle.rust-android") version "0.9.4"
-  id("com.google.protobuf") version "0.8.18"
+  id("com.google.protobuf") version "0.9.4"
+  id("com.android.library") version "8.5.2"
+  id("maven-publish")
 }
 
 val kotlinVersion: String by extra
 val pbandkVersion: String by extra
 val protobufVersion: String by extra
-val stremioCoreAndroidProfile: String by extra
 
 buildscript {
-  extra["kotlinVersion"] = "1.7.20"
-  extra["pbandkVersion"] = "0.14.2"
-  extra["protobufVersion"] = "3.21.0"
-  extra["stremioCoreAndroidProfile"] = "release"
-
-  val kotlinVersion: String by extra
+  extra["kotlinVersion"] = "1.9.25"
+  extra["pbandkVersion"] = "0.16.0"
+  extra["protobufVersion"] = "4.28.3"
 
   repositories {
     google()
     mavenCentral()
-    maven("https://plugins.gradle.org/m2/")
-  }
-
-  dependencies {
-    classpath("com.android.tools.build:gradle:7.2.2")
-    classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:${kotlinVersion}")
-    classpath("org.mozilla.rust-android-gradle:plugin:0.9.0")
-    classpath("com.google.protobuf:protobuf-gradle-plugin:0.8.18")
+    gradlePluginPortal()
   }
 }
 
-fun AndroidSourceSet.proto(action: SourceDirectorySet.() -> Unit) {
-  (this as? ExtensionAware)
-    ?.extensions
-    ?.getByName("proto")
-    ?.let { it as? SourceDirectorySet }
-    ?.apply(action)
-}
-
 kotlin {
-  android {
+  jvmToolchain(17)
+  androidTarget {
     // TODO: Adding a "debug" variant here results in failing imports in KMM projects. Figure out why.
     publishLibraryVariants("release")
   }
@@ -77,12 +57,12 @@ kotlin {
 }
 
 android {
-  compileSdk = 33
   ndkVersion = "27.2.12479018" // configure in .cargo/config.toml and workflows/release.yml as well
 
   defaultConfig {
+    namespace = "com.stremio.core"
     minSdk = 21
-    targetSdk = 33
+    compileSdk = 34
   }
 
   sourceSets {
@@ -94,16 +74,14 @@ android {
     }
   }
 
-  packagingOptions {
+  packaging {
     resources {
       excludes += "**/*.proto"
     }
   }
 }
 
 protobuf {
-  generatedFilesBaseDir = "$projectDir/src"
-
   protoc {
     artifact = "com.google.protobuf:protoc:${protobufVersion}"
   }
@@ -129,17 +107,11 @@ cargo {
   targetDirectory = "../target"
   targets = listOf("arm", "arm64", "x86", "x86_64")
   verbose = true
-  profile = stremioCoreAndroidProfile
+  profile = "release"
 }
 
 tasks.whenTaskAdded {
   if (name == "javaPreCompileDebug" || name == "javaPreCompileRelease" || name == "mergeDebugJniLibFolders" || name == "mergeReleaseJniLibFolders") {
     dependsOn("cargoBuild")
   }
 }
-
-tasks.withType<KotlinCompile>().configureEach {
-  kotlinOptions {
-    freeCompilerArgs += "-opt-in=kotlin.RequiresOptIn"
-  }
-}
diff --git a/stremio-core-kotlin/gradle/wrapper/gradle-wrapper.properties b/stremio-core-kotlin/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/stremio-core-kotlin/src/androidMain/AndroidManifest.xml b/stremio-core-kotlin/src/androidMain/AndroidManifest.xml
@@ -1,5 +1,4 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.stremio.core">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />

diff --git a/stremio-core-kotlin/src/androidMain/kotlin/com/stremio/core/Core.kt b/stremio-core-kotlin/src/androidMain/kotlin/com/stremio/core/Core.kt
@@ -66,10 +66,10 @@ actual object Core {
 
     @JvmStatic
     private fun onRuntimeEvent(eventProtobuf: ByteArray) {
-        listeners.forEach {
+        for (listener in listeners) {
             try {
                 val event = RuntimeEvent.decodeFromByteArray(eventProtobuf)
-                it.onEvent(event)
+                listener.onEvent(event)
             } catch (e: Exception) {
                 Log.e("Stremio", "Failed passing event: ", e)
             }