Skip to content

Commit

Permalink
1.2.5
Browse files Browse the repository at this point in the history
  • Loading branch information
TheBeastLT committed May 10, 2024
1 parent 65e4d0d commit ab34dfe
Show file tree
Hide file tree
Showing 4 changed files with 87 additions and 87 deletions.
2 changes: 1 addition & 1 deletion Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "stremio-core-android"
version = "1.2.4"
version = "1.2.5"
authors = ["Smart Code OOD"]
edition = "2021"
resolver = "2"
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,6 @@ allprojects {

```gradle
dependencies {
implementation 'com.github.Stremio:stremio-core-kotlin:1.2.4'
implementation 'com.github.Stremio:stremio-core-kotlin:1.2.5'
}
```
168 changes: 84 additions & 84 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -2,21 +2,21 @@ import com.google.protobuf.gradle.*
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile

group = "com.github.Stremio"
version = "1.2.4"
version = "1.2.5"

allprojects {
repositories {
google()
mavenCentral()
}
repositories {
google()
mavenCentral()
}
}

plugins {
kotlin("multiplatform") version "1.8.0"
id("maven-publish")
id("com.android.library") version "7.2.2"
id("org.mozilla.rust-android-gradle.rust-android") version "0.9.0"
id("com.google.protobuf") version "0.8.18"
kotlin("multiplatform") version "1.8.0"
id("maven-publish")
id("com.android.library") version "7.2.2"
id("org.mozilla.rust-android-gradle.rust-android") version "0.9.0"
id("com.google.protobuf") version "0.8.18"
}

val kotlinVersion: String by extra
Expand All @@ -25,108 +25,108 @@ 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

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")
}
extra["kotlinVersion"] = "1.7.20"
extra["pbandkVersion"] = "0.14.2"
extra["protobufVersion"] = "3.21.0"
extra["stremioCoreAndroidProfile"] = "release"

val kotlinVersion: String by extra

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")
}
}

kotlin {
android {
// TODO: Adding a "debug" variant here results in failing imports in KMM projects. Figure out why.
publishLibraryVariants("release")
android {
// TODO: Adding a "debug" variant here results in failing imports in KMM projects. Figure out why.
publishLibraryVariants("release")
}

@Suppress("UNUSED_VARIABLE")
sourceSets {
val commonMain by getting {
dependencies {
implementation("pro.streem.pbandk:pbandk-runtime:${pbandkVersion}")
}
}

@Suppress("UNUSED_VARIABLE")
sourceSets {
val commonMain by getting {
dependencies {
implementation("pro.streem.pbandk:pbandk-runtime:${pbandkVersion}")
}
}
val androidMain by getting {
dependencies {
implementation("org.jetbrains.kotlin:kotlin-reflect:${kotlinVersion}")
}
}
val androidMain by getting {
dependencies {
implementation("org.jetbrains.kotlin:kotlin-reflect:${kotlinVersion}")
}
}
}
}

android {
compileSdk = 33
ndkVersion = "21.4.7075529"
compileSdk = 33
ndkVersion = "21.4.7075529"

defaultConfig {
minSdk = 21
targetSdk = 33
}
defaultConfig {
minSdk = 21
targetSdk = 33
}

sourceSets {
getByName("main") {
manifest.srcFile("src/androidMain/AndroidManifest.xml")
}
sourceSets {
getByName("main") {
manifest.srcFile("src/androidMain/AndroidManifest.xml")
}
}

packagingOptions {
resources {
excludes += "**/*.proto"
}
packagingOptions {
resources {
excludes += "**/*.proto"
}
}
}

protobuf {
generatedFilesBaseDir = "$projectDir/src"
generatedFilesBaseDir = "$projectDir/src"

protoc {
artifact = "com.google.protobuf:protoc:${protobufVersion}"
}
protoc {
artifact = "com.google.protobuf:protoc:${protobufVersion}"
}

plugins {
id("pbandk") {
artifact = "pro.streem.pbandk:protoc-gen-pbandk-jvm:${pbandkVersion}:jvm8@jar"
}
plugins {
id("pbandk") {
artifact = "pro.streem.pbandk:protoc-gen-pbandk-jvm:${pbandkVersion}:jvm8@jar"
}
}

generateProtoTasks {
all().forEach { task ->
task.plugins {
id("pbandk")
}
}
generateProtoTasks {
all().forEach { task ->
task.plugins {
id("pbandk")
}
}
}
}

cargo {
module = "./"
libname = "stremio_core_android"
targets = listOf("arm", "arm64", "x86", "x86_64")
verbose = true
profile = stremioCoreAndroidProfile
module = "./"
libname = "stremio_core_android"
targets = listOf("arm", "arm64", "x86", "x86_64")
verbose = true
profile = stremioCoreAndroidProfile
}

tasks.whenTaskAdded {
if (name == "javaPreCompileDebug" || name == "javaPreCompileRelease" || name == "mergeDebugJniLibFolders" || name == "mergeReleaseJniLibFolders") {
dependsOn("cargoBuild")
}
if (name == "javaPreCompileDebug" || name == "javaPreCompileRelease" || name == "mergeDebugJniLibFolders" || name == "mergeReleaseJniLibFolders") {
dependsOn("cargoBuild")
}
}

tasks.withType<KotlinCompile>().configureEach {
kotlinOptions {
freeCompilerArgs += "-opt-in=kotlin.RequiresOptIn"
}
kotlinOptions {
freeCompilerArgs += "-opt-in=kotlin.RequiresOptIn"
}
}

0 comments on commit ab34dfe

Please sign in to comment.