Bugfixes and improvements

.github/workflows/mirroring.yaml

@@ -19,7 +19,7 @@ jobs:
         run: |
           git remote add gitlab https://oauth2:${{ secrets.GITLAB_TOKEN }}@gitlab.com/awxkee/jxl-coder.git
           git remote add codeberg https://awxkee:${{ secrets.CODEBERG_TOKEN }}@codeberg.org/awxkee/jxl-coder.git
-          git push gitlab --all --force
-          git push gitlab --tags --force
-          git push codeberg --all --force
-          git push codeberg --tags --force
+          git push gitlab --all
+          git push gitlab --tags
+          git push codeberg --all
+          git push codeberg --tags

app/build.gradle.kts

@@ -2,17 +2,17 @@ plugins {
     id("com.android.application")
     id("org.jetbrains.kotlin.android")
     id("com.google.devtools.ksp")
-    id("org.jetbrains.kotlin.plugin.compose") version "2.2.10"
+    id("org.jetbrains.kotlin.plugin.compose") version "2.3.21"
 }
 
 android {
     namespace = "com.awxkee.jxlcoder"
-    compileSdk = 35
+    compileSdk = 36
 
     defaultConfig {
         applicationId = "com.awxkee.jxlcoder"
         minSdk = 24
-        targetSdk = 35
+        targetSdk = 36
         versionCode = 1
         versionName = "1.0"
 
@@ -35,8 +35,10 @@ android {
         sourceCompatibility = JavaVersion.VERSION_17
         targetCompatibility = JavaVersion.VERSION_17
     }
-    kotlinOptions {
-        jvmTarget = "17"
+    kotlin {
+        jvmToolchain {
+            languageVersion.set(JavaLanguageVersion.of(17))
+        }
     }
     buildFeatures {
         compose = true

app/src/main/java/com/awxkee/jxlcoder/MainActivity.kt

@@ -129,9 +129,9 @@ class MainActivity : ComponentActivity() {
                                                 buffer4,
                                                 width = largeImageSize.width / 3,
                                                 height = largeImageSize.height / 3,
-                                                preferredColorConfig = PreferredColorConfig.RGBA_1010102,
+                                                preferredColorConfig = PreferredColorConfig.RGBA_8888,
                                                 com.awxkee.jxlcoder.ScaleMode.FIT,
-                                                jxlResizeFilter = JxlResizeFilter.LANCZOS
+                                                jxlResizeFilter = JxlResizeFilter.MITCHELL_NETRAVALI
                                             )
                                             lifecycleScope.launch {
                                                 imagesArray.add(srcImage)

build.gradle.kts

@@ -1,7 +1,7 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 plugins {
-    id("com.android.application") version "9.0.0" apply false
+    id("com.android.application") version "9.2.1" apply false
     id("org.jetbrains.kotlin.android") version "2.2.10" apply false
-    id("com.android.library") version "9.0.0" apply false
+    id("com.android.library") version "9.2.1" apply false
     id("com.google.devtools.ksp") version "2.3.2" apply false
 }

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 #Sun Aug 20 15:15:13 GET 2023
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-9.1.0-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.4.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

jxlcoder/build.gradle.kts

@@ -1,27 +1,29 @@
-import com.android.build.gradle.internal.tasks.factory.dependsOn
 import com.vanniktech.maven.publish.AndroidMultiVariantLibrary
+import com.vanniktech.maven.publish.DeploymentValidation
+import com.vanniktech.maven.publish.JavadocJar
+import com.vanniktech.maven.publish.SourcesJar
 
 plugins {
     id("com.android.library")
     id("org.jetbrains.kotlin.android")
-    id("maven-publish")
-    id("signing")
     id("com.vanniktech.maven.publish") version "0.36.0"
 }
 
 
 mavenPublishing {
     if (System.getenv("PUBLISH_STATE") == "Release") {
+        publishToMavenCentral(
+            automaticRelease = true,
+            validateDeployment = DeploymentValidation.PUBLISHED
+        )
         signAllPublications()
     }
-}
 
-mavenPublishing {
     configure(
         AndroidMultiVariantLibrary(
-        sourcesJar = true,
-        publishJavadocJar = true,
-    )
+            JavadocJar.Javadoc(),
+            SourcesJar.Sources(),
+        )
     )
 
     coordinates("io.github.awxkee", "jxl-coder", System.getenv("VERSION_NAME") ?: "0.0.10")
@@ -61,7 +63,7 @@ mavenPublishing {
 
 android {
     namespace = "io.github.awxkee.jxlcoder"
-    compileSdk = 35
+    compileSdk = 36
 
     defaultConfig {
         minSdk = 21
@@ -71,16 +73,16 @@ android {
         externalNativeBuild {
             cmake {
                 ndkVersion = "26.1.10909125"
-                cppFlags.add ("-std=c++20")
+                cppFlags.add("-std=c++20")
                 abiFilters += setOf("armeabi-v7a", "arm64-v8a", "x86_64", "x86")
             }
         }
+    }
 
-        publishing {
-            singleVariant("release") {
-                withSourcesJar()
-                withJavadocJar()
-            }
+    publishing {
+        singleVariant("release") {
+            withSourcesJar()
+            withJavadocJar()
         }
     }
 
@@ -94,9 +96,9 @@ android {
         }
     }
 
-    sourceSets.named("main") {
-        this.jniLibs {
-            this.srcDir("src/main/cpp/lib")
+    sourceSets {
+        getByName("main") {
+            jniLibs.directories.add("src/main/cpp/lib")
         }
     }
 
@@ -110,15 +112,17 @@ android {
         sourceCompatibility = JavaVersion.VERSION_17
         targetCompatibility = JavaVersion.VERSION_17
     }
-    kotlinOptions {
-        jvmTarget = "17"
+    kotlin {
+        jvmToolchain {
+            languageVersion.set(JavaLanguageVersion.of(17))
+        }
     }
 }
 
 dependencies {
-    implementation("androidx.core:core-ktx:1.16.0")
+    implementation("androidx.core:core-ktx:1.18.0")
     implementation("androidx.appcompat:appcompat:1.7.1")
-    implementation("com.google.android.material:material:1.12.0")
+    implementation("com.google.android.material:material:1.13.0")
     testImplementation("junit:junit:4.13.2")
     androidTestImplementation("androidx.test.ext:junit:1.3.0")
     androidTestImplementation("androidx.test.espresso:espresso-core:3.7.0")