Merge pull request #56 from Stremio/chore/move-stremio-core-kotlin-to…

…-own-crate Chore/move stremio core kotlin to own crate
Stremio · Nov 5, 2024 · 591f600 · 591f600
2 parents 7ca0ae9 + 568dcd5
commit 591f600
Show file tree

Hide file tree

Showing 35 changed files with 127 additions and 112 deletions.
diff --git a/.github/workflows/build.yml → .github/workflows/build-kotlin.yml b/.github/workflows/build.yml → .github/workflows/build-kotlin.yml
@@ -1,4 +1,4 @@
-name: Build
+name: Build (stremio-core-kotlin)
 
 on:
   push:
@@ -41,7 +41,7 @@ jobs:
         uses: Swatinem/rust-cache@v2
 
       - name: Build code
-        run: cargo build -p stremio-core-android
+        run: cargo build -p stremio-core-kotlin
 
       - name: Lint code format
         run: cargo fmt --all -- --check

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -1,4 +1,4 @@
-name: Release stremio-core-android
+name: Release stremio-core-kotlin
 
 on:
   release:
@@ -43,16 +43,19 @@ jobs:
       - uses: Swatinem/rust-cache@v2
 
       - name: Build aar
+        working-directory: stremio-core-kotlin
         run: ./gradlew -Pversion=${GITHUB_REF##*/} publishToMavenLocal
       - name: Archive artifacts
+        working-directory: stremio-core-kotlin
         run: tar -C ~/.m2/repository/com/github/Stremio -cvzf stremio-core-kotlin.tar.gz .
       - name: Archive build
+        working-directory: stremio-core-kotlin
         run: tar -C build -cvzf build.tar.gz publications
       - name: Upload build artifacts
         uses: svenstaro/upload-release-action@v2
         with:
           repo_token: ${{ secrets.GITHUB_TOKEN }}
-          file: "*.tar.gz"
+          file: "stremio-core-kotlin/*.tar.gz"
           tag: ${{ github.ref }}
           overwrite: true
           file_glob: true
diff --git a/.gitignore b/.gitignore
@@ -1,8 +1,8 @@
-/build
-/target
-/.gradle
-/src/debug
-/src/release
+**/build
+**/target
+**/.gradle
+**/src/debug
+**/src/release
 /.idea/
 /local.properties
 

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,33 +1,6 @@
-[package]
-name = "stremio-core-android"
-version = "1.2.6"
-authors = ["Smart Code OOD"]
-edition = "2021"
-
-rust-version = "1.70.0"
-
-[features]
-default = ["kotlin"]
-kotlin = [
-    # for fetch (making requests):
-    "dep:http",
-    "dep:reqwest",
-    "dep:openssl",
-    "dep:http-cache-reqwest",
-    "dep:reqwest-middleware",
-    # executors
-    "dep:tokio",
-    # java bindings
-    "dep:jni",
-    "dep:getrandom",
-]
-
-[lib]
-path = "src/commonMain/rust/lib.rs"
-
 [workspace]
 resolver = "2"
-members = ["stremio-core-protobuf"]
+members = ["stremio-core-kotlin", "stremio-core-protobuf"]
 
 [workspace.dependencies]
 stremio-core = { version = "0.1", git = "https://github.com/Stremio/stremio-core", branch = "development", features = [
@@ -73,63 +46,3 @@ futures = "0.3"
 [profile.release]
 lto = true
 opt-level = 3
-
-[dependencies]
-stremio-core.workspace = true
-# stremio-core-web.workspace = true
-stremio-core-protobuf.workspace = true
-
-serde.workspace = true
-serde_json.workspace = true
-serde_path_to_error.workspace = true
-
-strum = { version = "0.22.*", features = ["derive"] }
-
-# Utils
-once_cell.workspace = true
-semver = { version = "1", features = ["serde"] }
-enclose = "1.1.*"
-itertools.workspace = true
-chrono.workspace = true
-boolinator = "2.4.*"
-Inflector = "0.11.*"
-cfg-if = "0.1.*"
-auto_impl = "0.5.*"
-
-base64 = "0.13.*"
-hex.workspace = true
-flate2 = "1.0.*"
-url = { version = "2.4", features = ["serde"] }
-percent-encoding = "2.1"
-
-# kotlin specific + Env impl
-getrandom = { workspace = true, optional = true }
-
-jni = { version = "0.19.*", optional = true }
-
-# Async executor
-tokio = { version = "1", features = ["rt", "rt-multi-thread"], optional = true }
-# Futures
-futures.workspace = true
-
-# Http Request handling
-http = { workspace = true, optional = true }
-reqwest = { workspace = true, features = ["json", "rustls-tls"], optional = true }
-openssl = { workspace = true, features = ["vendored"], optional = true }
-http-cache-reqwest = { workspace = true, optional = true }
-reqwest-middleware = { workspace = true, optional = true }
-
-# Bytes / Protobuf
-bytes = "1.1.0"
-prost.workspace = true
-prost-types.workspace = true
-
-[build-dependencies]
-prost-build.workspace = true
-protox.workspace = true
-glob.workspace = true
-
-# A way to quickly test with local version of `core` crates
-# [patch.'https://github.com/Stremio/stremio-core']
-# stremio-core = { path = "../core" }
-# stremio-core-web = { path = "../core/stremio-core-web" }
diff --git a/src/commonMain/rust/model.rs b/src/commonMain/rust/model.rs
diff --git a/stremio-core-kotlin/.cargo/config copy.toml b/stremio-core-kotlin/.cargo/config copy.toml
@@ -0,0 +1,9 @@
+[env]
+NDK_VERSION = "27.2.12479018"
+
+# Set the same RANLIB binary location for all the 4 targets:
+# armv7-linux-androideabi, aarch64-linux-android, i686-linux-android, x86_64-linux-android
+RANLIB_armv7_linux_androideabi = "$$ANDROID_HOME/ndk/$$NDK_VERSION/toolchains/llvm/prebuilt/linux-x86_64/bin/llvm-ranlib"
+RANLIB_aarch64_linux_android = "$$ANDROID_HOME/ndk/$$NDK_VERSION/toolchains/llvm/prebuilt/linux-x86_64/bin/llvm-ranlib"
+RANLIB_i686_linux_android = "$$ANDROID_HOME/ndk/$$NDK_VERSION/toolchains/llvm/prebuilt/linux-x86_64/bin/llvm-ranlib"
+RANLIB_x86_64_linux_android = "$$ANDROID_HOME/ndk/$$NDK_VERSION/toolchains/llvm/prebuilt/linux-x86_64/bin/llvm-ranlib"
diff --git a/.cargo/config.toml → stremio-core-kotlin/.cargo/config.toml b/.cargo/config.toml → stremio-core-kotlin/.cargo/config.toml
diff --git a/stremio-core-kotlin/Cargo.toml b/stremio-core-kotlin/Cargo.toml
@@ -0,0 +1,88 @@
+[package]
+name = "stremio-core-kotlin"
+version = "1.2.6"
+authors = ["Smart Code OOD"]
+edition = "2021"
+
+rust-version = "1.70.0"
+
+[features]
+default = ["kotlin"]
+kotlin = [
+    # for fetch (making requests):
+    "dep:http",
+    "dep:reqwest",
+    "dep:openssl",
+    "dep:http-cache-reqwest",
+    "dep:reqwest-middleware",
+    # executors
+    "dep:tokio",
+    # java bindings
+    "dep:jni",
+    "dep:getrandom",
+]
+
+[lib]
+name = "stremio_core_kotlin"
+path = "src/commonMain/rust/lib.rs"
+crate-type = ["staticlib", "dylib"]
+
+[dependencies]
+stremio-core.workspace = true
+# stremio-core-web.workspace = true
+stremio-core-protobuf.workspace = true
+
+serde.workspace = true
+serde_json.workspace = true
+serde_path_to_error.workspace = true
+
+strum = { version = "0.22.*", features = ["derive"] }
+
+# Utils
+once_cell.workspace = true
+semver = { version = "1", features = ["serde"] }
+enclose = "1.1.*"
+itertools.workspace = true
+chrono.workspace = true
+boolinator = "2.4.*"
+Inflector = "0.11.*"
+cfg-if = "0.1.*"
+auto_impl = "0.5.*"
+
+base64 = "0.13.*"
+hex.workspace = true
+flate2 = "1.0.*"
+url = { version = "2.4", features = ["serde"] }
+percent-encoding = "2.1"
+
+# kotlin specific + Env impl
+getrandom = { workspace = true, optional = true }
+
+jni = { version = "0.19.*", optional = true }
+
+# Async executor
+tokio = { version = "1", features = ["rt", "rt-multi-thread"], optional = true }
+# Futures
+futures.workspace = true
+
+# Http Request handling
+http = { workspace = true, optional = true }
+reqwest = { workspace = true, features = ["json", "rustls-tls"], optional = true }
+openssl = { workspace = true, features = ["vendored"], optional = true }
+http-cache-reqwest = { workspace = true, optional = true }
+reqwest-middleware = { workspace = true, optional = true }
+
+# Bytes / Protobuf
+bytes = "1.1.0"
+prost.workspace = true
+prost-types.workspace = true
+
+[build-dependencies]
+prost-build.workspace = true
+protox.workspace = true
+glob.workspace = true
+
+# A way to quickly test with local version of `core` crates
+# [patch.'https://github.com/Stremio/stremio-core']
+# stremio-core = { path = "../core" }
+# stremio-core-web = { path = "../core/stremio-core-web" }
diff --git a/LICENSE.md → stremio-core-kotlin/LICENSE.md b/LICENSE.md → stremio-core-kotlin/LICENSE.md
diff --git a/README.md → stremio-core-kotlin/README.md b/README.md → stremio-core-kotlin/README.md
diff --git a/build.gradle.kts → stremio-core-kotlin/build.gradle.kts b/build.gradle.kts → stremio-core-kotlin/build.gradle.kts
@@ -88,7 +88,7 @@ android {
   sourceSets {
     getByName("main") {
       proto {
-        srcDirs("stremio-core-protobuf/proto")
+        srcDirs("../stremio-core-protobuf/proto")
       }
       manifest.srcFile("src/androidMain/AndroidManifest.xml")
     }
@@ -125,7 +125,8 @@ protobuf {
 
 cargo {
   module = "./"
-  libname = "stremio_core_android"
+  libname = "stremio_core_kotlin"
+  targetDirectory = "../target"
   targets = listOf("arm", "arm64", "x86", "x86_64")
   verbose = true
   profile = stremioCoreAndroidProfile

diff --git a/gradle.properties → stremio-core-kotlin/gradle.properties b/gradle.properties → stremio-core-kotlin/gradle.properties
diff --git a/gradle/wrapper/gradle-wrapper.jar → ...-kotlin/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar → ...-kotlin/gradle/wrapper/gradle-wrapper.jar
diff --git a/gradle/wrapper/gradle-wrapper.properties → .../gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties → .../gradle/wrapper/gradle-wrapper.properties
diff --git a/gradlew → stremio-core-kotlin/gradlew b/gradlew → stremio-core-kotlin/gradlew
diff --git a/gradlew.bat → stremio-core-kotlin/gradlew.bat b/gradlew.bat → stremio-core-kotlin/gradlew.bat
diff --git a/settings.gradle.kts → stremio-core-kotlin/settings.gradle.kts b/settings.gradle.kts → stremio-core-kotlin/settings.gradle.kts
diff --git a/src/androidMain/AndroidManifest.xml → ...otlin/src/androidMain/AndroidManifest.xml b/src/androidMain/AndroidManifest.xml → ...otlin/src/androidMain/AndroidManifest.xml
diff --git a/...droidMain/kotlin/com/stremio/core/Core.kt → ...droidMain/kotlin/com/stremio/core/Core.kt b/...droidMain/kotlin/com/stremio/core/Core.kt → ...droidMain/kotlin/com/stremio/core/Core.kt
@@ -15,7 +15,7 @@ import kotlin.reflect.full.companionObjectInstance
 
 actual object Core {
     init {
-        System.loadLibrary("stremio_core_android")
+        System.loadLibrary("stremio_core_kotlin")
     }
 
     actual fun interface EventListener {

diff --git a/...Main/kotlin/com/stremio/core/DeepLinks.kt → ...Main/kotlin/com/stremio/core/DeepLinks.kt b/...Main/kotlin/com/stremio/core/DeepLinks.kt → ...Main/kotlin/com/stremio/core/DeepLinks.kt
diff --git a/...ommonMain/kotlin/com/stremio/core/Core.kt → ...ommonMain/kotlin/com/stremio/core/Core.kt b/...ommonMain/kotlin/com/stremio/core/Core.kt → ...ommonMain/kotlin/com/stremio/core/Core.kt
diff --git a/...onMain/kotlin/com/stremio/core/Storage.kt → ...onMain/kotlin/com/stremio/core/Storage.kt b/...onMain/kotlin/com/stremio/core/Storage.kt → ...onMain/kotlin/com/stremio/core/Storage.kt
diff --git a/src/commonMain/rust/bridge.rs → ...core-kotlin/src/commonMain/rust/bridge.rs b/src/commonMain/rust/bridge.rs → ...core-kotlin/src/commonMain/rust/bridge.rs
diff --git a/...onMain/rust/bridge/android_model_field.rs → ...onMain/rust/bridge/android_model_field.rs b/...onMain/rust/bridge/android_model_field.rs → ...onMain/rust/bridge/android_model_field.rs
diff --git a/...mmonMain/rust/bridge/to_jni_byte_array.rs → ...mmonMain/rust/bridge/to_jni_byte_array.rs b/...mmonMain/rust/bridge/to_jni_byte_array.rs → ...mmonMain/rust/bridge/to_jni_byte_array.rs
diff --git a/src/commonMain/rust/env/env.rs → ...ore-kotlin/src/commonMain/rust/env/env.rs b/src/commonMain/rust/env/env.rs → ...ore-kotlin/src/commonMain/rust/env/env.rs
diff --git a/src/commonMain/rust/env/event.rs → ...e-kotlin/src/commonMain/rust/env/event.rs b/src/commonMain/rust/env/event.rs → ...e-kotlin/src/commonMain/rust/env/event.rs
diff --git a/src/commonMain/rust/env/fetch.rs → ...e-kotlin/src/commonMain/rust/env/fetch.rs b/src/commonMain/rust/env/fetch.rs → ...e-kotlin/src/commonMain/rust/env/fetch.rs
diff --git a/src/commonMain/rust/env/kotlin_class_name.rs → .../commonMain/rust/env/kotlin_class_name.rs b/src/commonMain/rust/env/kotlin_class_name.rs → .../commonMain/rust/env/kotlin_class_name.rs
diff --git a/src/commonMain/rust/env/storage.rs → ...kotlin/src/commonMain/rust/env/storage.rs b/src/commonMain/rust/env/storage.rs → ...kotlin/src/commonMain/rust/env/storage.rs
diff --git a/src/commonMain/rust/jni_ext.rs → ...ore-kotlin/src/commonMain/rust/jni_ext.rs b/src/commonMain/rust/jni_ext.rs → ...ore-kotlin/src/commonMain/rust/jni_ext.rs
diff --git a/src/commonMain/rust/lib.rs → ...io-core-kotlin/src/commonMain/rust/lib.rs b/src/commonMain/rust/lib.rs → ...io-core-kotlin/src/commonMain/rust/lib.rs
@@ -2,13 +2,13 @@
 
 #[cfg(feature = "kotlin")]
 // Re-export the kotlin-specific impls
-pub use stremio_core_android::*;
+pub use stremio_core_kotlin::*;
 
 #[cfg(feature = "kotlin")]
 pub mod bridge;
 
 #[cfg(feature = "kotlin")]
-/// Contains all android (kotlin) related implementations for the bridge between
+/// Contains all kotlin (for android) related implementations for the bridge between
 /// Rust and Kotlin.
 ///
 /// - [AndroidEnv](crate::env::AndroidEnv)
@@ -32,7 +32,15 @@ pub mod env {
     pub use storage::*;
 }
 
-pub mod model;
+pub mod model {
+    #[cfg(feature = "kotlin")]
+    pub use model::*;
+
+    #[cfg(feature = "kotlin")]
+    // model is only available when the feature is enabled
+    // because of the `AndroidEnv` impl
+    mod model;
+}
 #[allow(clippy::all)]
 /// Protobuf generated module
 pub mod protobuf {
@@ -42,4 +50,4 @@ pub mod protobuf {
 #[cfg(feature = "kotlin")]
 pub mod jni_ext;
 #[cfg(feature = "kotlin")]
-mod stremio_core_android;
+mod stremio_core_kotlin;
diff --git a/src/commonMain/rust/model/model.rs → ...kotlin/src/commonMain/rust/model/model.rs b/src/commonMain/rust/model/model.rs → ...kotlin/src/commonMain/rust/model/model.rs
diff --git a/src/commonMain/rust/stremio_core_android.rs → ...rc/commonMain/rust/stremio_core_kotlin.rs b/src/commonMain/rust/stremio_core_android.rs → ...rc/commonMain/rust/stremio_core_kotlin.rs