Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions libs/gl-sdk-android/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -72,3 +72,4 @@ glsdk.common.kt
glsdk.android.kt
glsdk.jvm.kt
glsdk.native.kt
glsdk.kt
2 changes: 1 addition & 1 deletion libs/gl-sdk-android/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// Top-level build file where you can add configuration options common to all sub-projects/modules.
plugins {
alias(libs.plugins.androidLibrary) apply false
alias(libs.plugins.androidKotlinMultiplatformLibrary) apply false
alias(libs.plugins.kotlinMultiplatform) apply false
alias(libs.plugins.kotlinSerialization) apply false
alias(libs.plugins.mavenPublish) apply false
Expand Down
11 changes: 4 additions & 7 deletions libs/gl-sdk-android/gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -17,16 +17,13 @@ org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8
android.useAndroidX=true
# Kotlin code style for this project: "official" or "obsolete":
kotlin.code.style=official
# Enables namespacing of each library's R class so that its R class includes only the
# resources declared in the library itself and none from the library's dependencies,
# thereby reducing the size of the R class for that library
android.nonTransitiveRClass=true

# The generated bindings use kotlinx.atomicfu. These flags (default: false) make the atomicfu
# Kotlin compiler plugin replace atomics with plain fields and intrinsics during compilation.
# Without them, JVM/Android fall back to post-compilation bytecode transformation and
# Kotlin/Native keeps every atomic as a boxed wrapper object.
kotlinx.atomicfu.enableJvmIrTransformation=true
kotlinx.atomicfu.enableNativeIrTransformation=true

kotlin.mpp.enableCInteropCommonization=true
android.builtInKotlin=false
android.newDsl=false

libraryVersion=0.4.0
17 changes: 10 additions & 7 deletions libs/gl-sdk-android/gradle/libs.versions.toml
Original file line number Diff line number Diff line change
@@ -1,16 +1,19 @@
[versions]
# Kotlin 2.3.0 - 2.4.x reject the generated bindings in compileNativeMainKotlinMetadata with a
# false positive "Member overrides different '@Throws' filter" (KT-88548, fixed in Kotlin 2.5.0).
# annotation >= 1.10.0 and kotlinx-serialization >= 1.10.0 publish klibs that require Kotlin 2.3.
annotation = "1.9.1"
kotlin = "2.2.21"
kotlinx-serialization = "1.9.0"
kotlinx-coroutines = "1.10.2"
android-gradle-plugin = "9.0.0"
okio = "3.16.4"
kotlinx-coroutines = "1.11.0"
android-gradle-plugin = "9.4.1"
okio = "3.18.2"
espresso = "3.7.0"
jna = "5.18.1"
jna = "5.19.1"
junit = "4.13.2"
junit-ext = "1.3.0"
maven-publish = "0.36.0"
atomicfu = "0.31.0"
maven-publish = "0.37.0"
atomicfu = "0.33.0"

[libraries]
annotation = { module = "androidx.annotation:annotation", version.ref = "annotation" }
Expand All @@ -24,7 +27,7 @@ junit-ext = { module = "androidx.test.ext:junit", version.ref = "junit-ext" }
junit = { module = "junit:junit", version.ref = "junit" }

[plugins]
androidLibrary = { id = "com.android.library", version.ref = "android-gradle-plugin" }
androidKotlinMultiplatformLibrary = { id = "com.android.kotlin.multiplatform.library", version.ref = "android-gradle-plugin" }
kotlinMultiplatform = { id = "org.jetbrains.kotlin.multiplatform", version.ref = "kotlin" }
kotlinSerialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin" }
atomicfu = { id = "org.jetbrains.kotlinx.atomicfu", version.ref = "atomicfu" }
Expand Down
Binary file modified libs/gl-sdk-android/gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
4 changes: 3 additions & 1 deletion libs/gl-sdk-android/gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-9.2.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-9.7.1-bin.zip
networkTimeout=10000
retries=0
retryBackOffMs=500
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
Loading
Loading