From 205661247270f7e9df309b1a7bb5c70322d92d47 Mon Sep 17 00:00:00 2001 From: Radzivon Bartoshyk Date: Sun, 10 May 2026 11:18:23 +0100 Subject: [PATCH] Build fixes --- README.md | 2 -- build.gradle.kts | 2 +- gradle.properties | 2 -- jxlcoder/build.gradle.kts | 18 ++++++++++-------- jxlcoder/src/main/cpp/JxlEncoder.cpp | 2 +- settings.gradle.kts | 3 +++ 6 files changed, 15 insertions(+), 14 deletions(-) diff --git a/README.md b/README.md index 8bd17a8..237db63 100644 --- a/README.md +++ b/README.md @@ -9,8 +9,6 @@ capabilities to enhance your app's image handling capabilities. Simple and conve ICC profiles supported. Supports animations as well -Image processing speeded up by [libhwy](https://github.com/google/highway) - # Usage example ```kotlin diff --git a/build.gradle.kts b/build.gradle.kts index 64808f1..7a8fbdc 100644 --- a/build.gradle.kts +++ b/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.2.1" apply false - id("org.jetbrains.kotlin.android") version "2.2.10" apply false + id("org.jetbrains.kotlin.android") version "2.3.21" apply false id("com.android.library") version "9.2.1" apply false id("com.google.devtools.ksp") version "2.3.2" apply false } \ No newline at end of file diff --git a/gradle.properties b/gradle.properties index 1af28fb..5e71f3f 100644 --- a/gradle.properties +++ b/gradle.properties @@ -22,8 +22,6 @@ kotlin.code.style=official # thereby reducing the size of the R class for that library android.nonTransitiveRClass=true -SONATYPE_HOST=CENTRAL_PORTAL -SONATYPE_AUTOMATIC_RELEASE=true android.defaults.buildfeatures.resvalues=true android.sdk.defaultTargetSdkToCompileSdkIfUnset=false android.enableAppCompileTimeRClass=false diff --git a/jxlcoder/build.gradle.kts b/jxlcoder/build.gradle.kts index 5354983..59c2580 100644 --- a/jxlcoder/build.gradle.kts +++ b/jxlcoder/build.gradle.kts @@ -6,19 +6,13 @@ 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() - } - configure( AndroidMultiVariantLibrary( JavadocJar.Javadoc(), @@ -59,6 +53,14 @@ mavenPublishing { developerConnection.set("scm:git:ssh://git@github.com/awxkee/jxl-coder.git") } } + + if (System.getenv("PUBLISH_STATE") == "Release") { + publishToMavenCentral( + automaticRelease = true, + validateDeployment = DeploymentValidation.PUBLISHED + ) + signAllPublications() + } } android { diff --git a/jxlcoder/src/main/cpp/JxlEncoder.cpp b/jxlcoder/src/main/cpp/JxlEncoder.cpp index 3b98ebd..9630be2 100644 --- a/jxlcoder/src/main/cpp/JxlEncoder.cpp +++ b/jxlcoder/src/main/cpp/JxlEncoder.cpp @@ -29,7 +29,7 @@ #include #include #include -#include +#include #include "android/bitmap.h" #include #include "JniExceptions.h" diff --git a/settings.gradle.kts b/settings.gradle.kts index f238b61..6d86e30 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -5,6 +5,9 @@ pluginManagement { gradlePluginPortal() } } +plugins { + id("org.gradle.toolchains.foojay-resolver-convention") version "1.0.0" +} dependencyResolutionManagement { repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS) repositories {