Update configuration

Author: mrnektom

build.gradle

@@ -0,0 +1,13 @@
+// Top-level build file where you can add configuration options common to all sub-projects/modules.
+
+plugins {
+    id("com.android.library") version "8.10.0" apply false
+    kotlin("android") version "2.1.10" apply false
+    id("maven-publish")
+}
+
+configurations.all {
+    resolutionStrategy {
+        failOnVersionConflict()
+    }
+}

build.gradle.kts

@@ -1,4 +1,4 @@
-#Wed Jun 04 18:05:05 MSK 2025
+#Wed Jun 04 17:20:58 MSK 2025
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.1-bin.zip

gradle/wrapper/gradle-wrapper.properties

@@ -0,0 +1,60 @@
+plugins {
+    id("com.android.library") version "8.10.0"
+    kotlin("android") version "2.1.10"
+    id("maven-publish")
+}
+
+group = "tachiyomiorg"
+
+android {
+    compileSdk = 36
+    ndkVersion = "28.2.13676358"
+    namespace = "tachiyomi.decoder"
+
+    defaultConfig {
+        minSdk = 21
+
+        consumerProguardFiles("consumer-rules.pro")
+        externalNativeBuild {
+            cmake {
+            }
+        }
+    }
+
+    buildTypes {
+        release {
+            isMinifyEnabled = false
+            proguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro")
+        }
+    }
+    compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_1_8
+        targetCompatibility = JavaVersion.VERSION_1_8
+    }
+    kotlinOptions {
+        jvmTarget = "1.8"
+    }
+    externalNativeBuild {
+        cmake {
+            path = file("src/main/cpp/CMakeLists.txt")
+            version = "3.22.1+"
+        }
+    }
+}
+
+dependencies {
+}
+
+afterEvaluate {
+    publishing {
+        publications {
+            // Creates a Maven publication called "release".
+//            release(MavenPublication) {
+////                from components.release
+//                groupId = "tachiyomiorg"
+//                artifactId = "image-decoder"
+//                version = "1.0"
+//            }
+        }
+    }
+}

library/build.gradle

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.14)
+cmake_minimum_required(VERSION 3.22..4.0)
 project(imagedecoder C CXX ASM)
 include(FetchContent)
 
@@ -7,9 +7,6 @@ set(CMAKE_BUILD_TYPE Release)
 option(WITH_JPEG "Include JPEG decoder" ON)
 option(WITH_PNG "Include PNG decoder" ON)
 option(WITH_WEBP "Include WebP decoder" ON)
-option(WITH_HEIF "Include HEIF decoder" OFF)
-option(WITH_AVIF "Include AVIF decoder" OFF)
-option(WITH_JXL "Include JXL decoder" OFF)
 
 add_library(imagedecoder SHARED
   java_stream.cpp
@@ -40,15 +37,5 @@ if(WITH_WEBP)
   add_definitions(-DHAVE_LIBWEBP)
   target_sources(imagedecoder PRIVATE decoder_webp.cpp)
 endif()
-if(WITH_HEIF OR WITH_AVIF)
-  add_subdirectory(libheif)
-  add_definitions(-DHAVE_LIBHEIF)
-  target_sources(imagedecoder PRIVATE decoder_heif.cpp)
-endif()
-if(WITH_JXL)
-  add_subdirectory(libjxl)
-  add_definitions(-DHAVE_LIBJXL)
-  target_sources(imagedecoder PRIVATE decoder_jxl.cpp)
-endif()
 
 target_link_libraries(imagedecoder android jnigraphics log)

library/build.gradle.kts

@@ -1,6 +1,6 @@
 FetchContent_Declare(lcms2
   GIT_REPOSITORY  https://github.com/mm2/Little-CMS
-  GIT_TAG         lcms2.16
+  GIT_TAG         lcms2.17
   PATCH_COMMAND   git apply ${CMAKE_CURRENT_LIST_DIR}/lcms2.12.patch || true
   BINARY_DIR      build
   SUBBUILD_DIR    subbuild

library/src/main/cpp/CMakeLists.txt

@@ -3,7 +3,7 @@
 @@ -0,0 +1,48 @@
 +project(lcms2)
 +
-+cmake_minimum_required(VERSION 2.8)
++cmake_minimum_required(VERSION 3.22..4.0)
 +
 +include_directories(include)
 +