From 5a04b315d5717efd64c4d3dfb332ac002f9e8321 Mon Sep 17 00:00:00 2001
From: Torsten Grote <t@grobox.de>
Date: Fri, 31 Oct 2025 17:19:19 -0300
Subject: [PATCH] Upgrade maven publishing plugin

---
 build.gradle                     |  6 ---
 gradle.properties                |  5 ++-
 gradle/libs.versions.toml        |  2 +-
 gradle/verification-metadata.xml | 70 ++++++++++++++++++++++++++++++++
 libs/core/build.gradle.kts       | 26 +++++++++---
 libs/core/gradle.properties      |  7 ++++
 libs/database/build.gradle.kts   |  2 +-
 libs/database/gradle.properties  |  2 +-
 libs/download/build.gradle.kts   |  2 +-
 libs/download/gradle.properties  |  2 +-
 libs/index/build.gradle.kts      |  2 +-
 libs/index/gradle.properties     |  2 +-
 12 files changed, 108 insertions(+), 20 deletions(-)
 create mode 100644 libs/core/gradle.properties

diff --git a/build.gradle b/build.gradle
index f2e9904ad..8a9f49847 100644
--- a/build.gradle
+++ b/build.gradle
@@ -21,12 +21,6 @@ allprojects {
         mavenCentral()
         maven { url 'https://maven.google.com/' }
     }
-    // use new Sonatype server for mavenCentral publishing
-    plugins.withId("com.vanniktech.maven.publish") {
-        mavenPublish {
-            sonatypeHost = "S01"
-        }
-    }
 }
 subprojects {
     apply plugin: "org.jlleitschuh.gradle.ktlint"
diff --git a/gradle.properties b/gradle.properties
index ce02a7cda..e72a4767e 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -8,6 +8,9 @@ kotlin.mpp.androidSourceSetLayoutVersion=2
 # Gradle Maven Publish Info below (https://github.com/vanniktech/gradle-maven-publish-plugin)
 # These are common for all libraries in gradle submodules.
 # Specifics for each library are defined in the submodule's gradle.properties file.
+mavenCentralPublishing=true
+mavenCentralAutomaticPublishing=true
+signAllPublications=true
 
 GROUP=org.fdroid
 
@@ -22,5 +25,3 @@ POM_SCM_DEV_CONNECTION=scm:git:ssh://git@gitlab.com:fdroid/fdroidclient.git
 POM_DEVELOPER_ID=grote
 POM_DEVELOPER_NAME=Torsten Grote
 POM_DEVELOPER_URL=https://github.com/grote/
-
-SONATYPE_AUTOMATIC_RELEASE=true
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index f3075365b..fe1495c65 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -4,7 +4,7 @@ kotlin = "2.2.0"
 androidGradlePlugin = "8.11.1" # 8.12.0 pulls in aapt2 which has issue on buildserver
 androidKspPlugin = "2.2.0-2.0.2" # first version needs to match kotlin version
 dokka = "2.0.0"
-mavenPublish = "0.18.0"
+mavenPublish = "0.34.0"
 jlleitschuhKtlint = "13.1.0"
 
 kotlinxSerializationJson = "1.9.0" # 1.4.1 because https://github.com/Kotlin/kotlinx.serialization/issues/2231
diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml
index bf3d468fb..ab9b0450d 100644
--- a/gradle/verification-metadata.xml
+++ b/gradle/verification-metadata.xml
@@ -10167,6 +10167,11 @@
             <sha256 value="8d67ecff95ea602c66fd06ed285cc43b7830cd6bb0915d43db30376b50e3a841" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="com.soywiz.korlibs.korte" name="korte-jvm" version="2.0.7">
+         <artifact name="korte-jvm-2.0.7.jar">
+            <sha256 value="0f3e6a5d568e9d4912bc2dcf7e6ef9b74b9859e7959144a34c90a22a7ded421a" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="com.soywiz.korlibs.korte" name="korte-jvm" version="2.4.6">
          <artifact name="korte-jvm-2.4.6.jar">
             <pgp value="1BE2DD4B1FCF252FE4F0A1D103281AA0289FF53A"/>
@@ -10308,6 +10313,11 @@
             <sha256 value="acb328a30b8609b34d9bcaf9a147d72e2279b55f6b22540aa45e0f1441e1fff3" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="com.squareup.okhttp3" name="okhttp-jvm" version="5.1.0">
+         <artifact name="okhttp-jvm-5.1.0.jar">
+            <sha256 value="a6aac7f15d3c2c3cbd2af7ecf56f97407164a604b2db879529950e31cea699b2" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="com.squareup.okhttp3" name="okhttp-sse" version="4.12.0">
          <artifact name="okhttp-sse-4.12.0.jar">
             <sha256 value="bff4fbcaef7aac2d910d4ff46dafaa4e6d15da127df6bac97216da46943a7d4c" origin="Generated by Gradle"/>
@@ -10353,6 +10363,11 @@
             <sha256 value="b5f5f280bb628e9f58f8bd39e7bcd2b0919dc66d90f05b80d3aab22f1b99cbea" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="com.squareup.okio" name="okio-jvm" version="3.15.0">
+         <artifact name="okio-jvm-3.15.0.jar">
+            <sha256 value="483dc383b1049d220892322a0d6a4308425f09bb05b48c43d4eaa9ff82b1cd16" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="com.squareup.okio" name="okio-jvm" version="3.16.0">
          <artifact name="okio-jvm-3.16.0.jar">
             <sha256 value="c737c035ca675187bf11a67ddb9581954bf0d5ca9f3e048e838b3267cf32b5c3" origin="Generated by Gradle"/>
@@ -10378,11 +10393,21 @@
             <sha256 value="e26cf1256afa208e13ab6d8fbfd458faa448f24b72799d8de55c0363f619be43" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="com.squareup.retrofit2" name="converter-scalars" version="3.0.0">
+         <artifact name="converter-scalars-3.0.0.jar">
+            <sha256 value="b97cf06929a80d49bc632e44f219cf0a7185fc4cee861ec90ad1d0e482084023" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="com.squareup.retrofit2" name="retrofit" version="2.9.0">
          <artifact name="retrofit-2.9.0.jar">
             <sha256 value="e6ea1929c46852f5bec66ab3357da383476cef4e8d1deefdbf195b79cc4d6581" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="com.squareup.retrofit2" name="retrofit" version="3.0.0">
+         <artifact name="retrofit-3.0.0.jar">
+            <sha256 value="69c6a2d3451b6df9549a93fab744094ebf07a4b0ce4f453d6c8f575ef0fec9a1" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="com.sun.activation" name="all" version="1.2.0">
          <artifact name="all-1.2.0.pom">
             <pgp value="4F7E32D440EF90A83011A8FC6425559C47CC79C4"/>
@@ -10460,12 +10485,22 @@
             <sha256 value="21fba22f830e9268f07cf4ab2d99e8181abbdcb0cb91ee0228eb3cb918dcdd1d" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="com.vanniktech" name="central-portal" version="0.34.0">
+         <artifact name="central-portal-0.34.0.jar">
+            <sha256 value="f47c96df5e76fae4351f8e8ef2a0054ed4cabef7f3373260c0f56fef263d2136" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="com.vanniktech" name="gradle-maven-publish-plugin" version="0.18.0">
          <artifact name="gradle-maven-publish-plugin-0.18.0.jar">
             <pgp value="7B72C18D9C362314BF8E981B0CAEBC0883C5BB65"/>
             <sha256 value="01c647a5d1e77c73d0b2b4f9fdf5ea61255dd3a967dcda7716ba63b9f9eec996" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="com.vanniktech" name="gradle-maven-publish-plugin" version="0.34.0">
+         <artifact name="gradle-maven-publish-plugin-0.34.0.jar">
+            <sha256 value="1b304ae327d7034de19511f77ad227ba59d7358e8b51d18b09da7a253fec4c05" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="commons-beanutils" name="commons-beanutils" version="1.9.3">
          <artifact name="commons-beanutils-1.9.3.jar">
             <pgp value="DDDEE87612E9FB95F5C8D91E411063A3A0FFD119"/>
@@ -15128,6 +15163,11 @@
             <sha256 value="da3bb054d590c8d3b79aceb6153acde4f28a72c58f6efb6fa2916da868b9f834" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="org.jetbrains.dokka" name="dokka-analysis" version="1.4.32">
+         <artifact name="dokka-analysis-1.4.32.jar">
+            <sha256 value="c826dbed27b0c98a5bedcf20c96b52b45acd279aaa585a34562b7bb5860f9067" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="org.jetbrains.dokka" name="dokka-analysis" version="1.6.21">
          <artifact name="dokka-analysis-1.6.21.jar">
             <sha256 value="b2fe436962c0f8d6a40e673bf3802470a80cd591be3c885b0a4a953dab495119" origin="Generated by Gradle"/>
@@ -15148,6 +15188,11 @@
             <sha256 value="cbdd6ac53d808150a38125045856ba04a5ca45cd4f326a6020c32953456ce914" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="org.jetbrains.dokka" name="dokka-base" version="1.4.32">
+         <artifact name="dokka-base-1.4.32.jar">
+            <sha256 value="569b95cb5cfabc87aadf512c825289746f702181eca4bfb8a1db9338065de091" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="org.jetbrains.dokka" name="dokka-base" version="1.6.21">
          <artifact name="dokka-base-1.6.21.jar">
             <sha256 value="010314ec02af1530da8be1839aecf5977b6496c9774837dd3f590969148aaa31" origin="Generated by Gradle"/>
@@ -15294,6 +15339,11 @@
             <sha256 value="8714c0840e56528836f32aeb4b04159f06f0baccbd219766810973db6cf5e76f" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="org.jetbrains.dokka" name="javadoc-plugin" version="1.4.32">
+         <artifact name="javadoc-plugin-1.4.32.jar">
+            <sha256 value="0167c505683acc7c0445cbc70bcaee159e50fcce067c6ddab0eb8475b310a52a" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="org.jetbrains.dokka" name="javadoc-plugin" version="1.6.21">
          <artifact name="javadoc-plugin-1.6.21.jar">
             <sha256 value="c71a785cd214cf3f56a98ae87e5c33b088a18575a9a6cc0af35c1a98b5621c3e" origin="Generated by Gradle"/>
@@ -15364,6 +15414,11 @@
             <sha256 value="9975f5dbfd57816590aae855e155dbec461f7c3c18ccc71925a5052b0c86dbf3" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="org.jetbrains.dokka" name="kotlin-analysis-compiler" version="1.4.32">
+         <artifact name="kotlin-analysis-compiler-1.4.32.jar">
+            <sha256 value="738e00fa7251a8a408d0a7c04fe97863f25592b472bbd1c463be2ee049d0a35f" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="org.jetbrains.dokka" name="kotlin-analysis-compiler" version="1.6.21">
          <artifact name="kotlin-analysis-compiler-1.6.21.jar">
             <sha256 value="d6a4ed1d6e4e471af83af9310c001760ec43920a2f7f84dd1f99d0609517562c" origin="Generated by Gradle"/>
@@ -15384,6 +15439,11 @@
             <sha256 value="8170906ef923981d34486c0ef149245988c9477fbde1d77603e2f1629d664b69" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="org.jetbrains.dokka" name="kotlin-analysis-intellij" version="1.4.32">
+         <artifact name="kotlin-analysis-intellij-1.4.32.jar">
+            <sha256 value="b1700d23c2e03d7327445b5b7a51de0e1f0cbff8b483e0c36ca74c116277e14a" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="org.jetbrains.dokka" name="kotlin-analysis-intellij" version="1.6.21">
          <artifact name="kotlin-analysis-intellij-1.6.21.jar">
             <sha256 value="4a763dfdf204075f304017758ffd6c329c71edcc74cb11902fadec293cdb66ae" origin="Generated by Gradle"/>
@@ -15404,6 +15464,11 @@
             <sha256 value="0f7e9fafc4ed5925d00239e96d7d471c67c7397ae783b1c4a78be62811369463" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="org.jetbrains.dokka" name="kotlin-as-java-plugin" version="1.4.32">
+         <artifact name="kotlin-as-java-plugin-1.4.32.jar">
+            <sha256 value="da5f3b4ac3911bf4b1513364ed1f6734d30081637304709033be9625e6bddbd7" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="org.jetbrains.dokka" name="kotlin-as-java-plugin" version="1.6.21">
          <artifact name="kotlin-as-java-plugin-1.6.21.jar">
             <sha256 value="dc6a704d7e3e972c98fd3ac8d80933d6f9b6f2dd1c98038242526b3eb2c133d8" origin="Generated by Gradle"/>
@@ -18121,6 +18186,11 @@
             <sha256 value="5ca175b38df331fd64155b35cd8cae1251fa9ee369709b36d42e0a288ccce3fd" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="org.jetbrains.kotlinx" name="kotlinx-coroutines-core-jvm" version="1.4.1">
+         <artifact name="kotlinx-coroutines-core-jvm-1.4.1.jar">
+            <sha256 value="6d2f87764b6638f27aff12ed380db4b63c9d46ba55dc32683a650598fa5a3e22" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="org.jetbrains.kotlinx" name="kotlinx-coroutines-core-jvm" version="1.5.0">
          <artifact name="kotlinx-coroutines-core-jvm-1.5.0.jar">
             <pgp value="E7DC75FC24FB3C8DFE8086AD3D5839A2262CBBFB"/>
diff --git a/libs/core/build.gradle.kts b/libs/core/build.gradle.kts
index 92f1918c9..055616067 100644
--- a/libs/core/build.gradle.kts
+++ b/libs/core/build.gradle.kts
@@ -4,10 +4,6 @@ plugins {
     alias(libs.plugins.jetbrains.dokka)
     alias(libs.plugins.vanniktech.maven.publish)
 }
-java {
-    sourceCompatibility = JavaVersion.VERSION_11
-    targetCompatibility = JavaVersion.VERSION_11
-}
 kotlin {
     androidTarget {
         compilerOptions {
@@ -45,6 +41,15 @@ android {
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
         testInstrumentationRunnerArguments["disableAnalytics"] = "true"
     }
+    buildTypes {
+        getByName("release") {
+            isMinifyEnabled = false
+            proguardFiles(
+                getDefaultProguardFile("proguard-android-optimize.txt"),
+                "proguard-rules.pro",
+            )
+        }
+    }
     compileOptions {
         sourceCompatibility = JavaVersion.VERSION_17
         targetCompatibility = JavaVersion.VERSION_17
@@ -55,12 +60,23 @@ signing {
     useGpgCmd()
 }
 
+mavenPublishing {
+    @Suppress("ktlint:standard:chain-method-continuation")
+    configure(
+        com.vanniktech.maven.publish.KotlinMultiplatform(
+            javadocJar = com.vanniktech.maven.publish.JavadocJar.Dokka("dokkaHtml"),
+            sourcesJar = true,
+            androidVariantsToPublish = listOf("release"),
+        ),
+    )
+}
+
 tasks.withType<org.jetbrains.dokka.gradle.DokkaTask>().configureEach {
     pluginsMapConfiguration.set(
         mapOf(
             "org.jetbrains.dokka.base.DokkaBase" to """{
                 "customAssets": ["${file("${rootProject.rootDir}/logo-icon.svg")}"],
-                "footerMessage": "© 2010-2025 F-Droid Limited and Contributors",
+                "footerMessage": "© 2010-2025 F-Droid Limited and Contributors"
         }""",
         ),
     )
diff --git a/libs/core/gradle.properties b/libs/core/gradle.properties
new file mode 100644
index 000000000..5f2ad1d2e
--- /dev/null
+++ b/libs/core/gradle.properties
@@ -0,0 +1,7 @@
+POM_ARTIFACT_ID=core
+VERSION_NAME=0.0.1
+
+POM_NAME=F-Droid core library
+POM_DESCRIPTION=A Kotlin multi-platform library to provide core classes.
+POM_INCEPTION_YEAR=2025
+POM_URL=https://gitlab.com/fdroid/fdroidclient/-/tree/master/libs/core
diff --git a/libs/database/build.gradle.kts b/libs/database/build.gradle.kts
index 3d94c7e56..a1b122d4b 100644
--- a/libs/database/build.gradle.kts
+++ b/libs/database/build.gradle.kts
@@ -128,7 +128,7 @@ tasks.withType<org.jetbrains.dokka.gradle.DokkaTask>().configureEach {
         mapOf(
             "org.jetbrains.dokka.base.DokkaBase" to """{
                 "customAssets": ["${file("${rootProject.rootDir}/logo-icon.svg")}"],
-                "footerMessage": "© 2010-2025 F-Droid Limited and Contributors",
+                "footerMessage": "© 2010-2025 F-Droid Limited and Contributors"
         }""",
         ),
     )
diff --git a/libs/database/gradle.properties b/libs/database/gradle.properties
index 1863bb57e..bec8bc1a4 100644
--- a/libs/database/gradle.properties
+++ b/libs/database/gradle.properties
@@ -1,5 +1,5 @@
 POM_ARTIFACT_ID=database
-VERSION_NAME=0.1.0
+VERSION_NAME=0.2.0
 
 POM_NAME=F-Droid database library
 POM_DESCRIPTION=An Android library to store F-Droid related info in Room such as repositories, apps and their versions.
diff --git a/libs/download/build.gradle.kts b/libs/download/build.gradle.kts
index 199983420..8d1e0c0b2 100644
--- a/libs/download/build.gradle.kts
+++ b/libs/download/build.gradle.kts
@@ -121,7 +121,7 @@ tasks.withType<org.jetbrains.dokka.gradle.DokkaTask>().configureEach {
         mapOf(
             "org.jetbrains.dokka.base.DokkaBase" to """{
                 "customAssets": ["${file("${rootProject.rootDir}/logo-icon.svg")}"],
-                "footerMessage": "© 2010-2025 F-Droid Limited and Contributors",
+                "footerMessage": "© 2010-2025 F-Droid Limited and Contributors"
         }""",
         ),
     )
diff --git a/libs/download/gradle.properties b/libs/download/gradle.properties
index 9784f28a8..5827ff7fd 100644
--- a/libs/download/gradle.properties
+++ b/libs/download/gradle.properties
@@ -1,5 +1,5 @@
 POM_ARTIFACT_ID=download
-VERSION_NAME=0.1.1
+VERSION_NAME=0.2.0
 
 POM_NAME=F-Droid download library
 POM_DESCRIPTION=A Kotlin multi-platform library to download F-Droid related files via HTTP.
diff --git a/libs/index/build.gradle.kts b/libs/index/build.gradle.kts
index e7917a4f0..875ebefc7 100644
--- a/libs/index/build.gradle.kts
+++ b/libs/index/build.gradle.kts
@@ -99,7 +99,7 @@ tasks.withType<org.jetbrains.dokka.gradle.DokkaTask>().configureEach {
         mapOf(
             "org.jetbrains.dokka.base.DokkaBase" to """{
                 "customAssets": ["${file("${rootProject.rootDir}/logo-icon.svg")}"],
-                "footerMessage": "© 2010-2025 F-Droid Limited and Contributors",
+                "footerMessage": "© 2010-2025 F-Droid Limited and Contributors"
         }""",
         ),
     )
diff --git a/libs/index/gradle.properties b/libs/index/gradle.properties
index 704e98b76..96bdb7818 100644
--- a/libs/index/gradle.properties
+++ b/libs/index/gradle.properties
@@ -1,5 +1,5 @@
 POM_ARTIFACT_ID=index
-VERSION_NAME=0.1.1
+VERSION_NAME=0.2.0
 
 POM_NAME=F-Droid index library
 POM_DESCRIPTION=A Kotlin multi-platform library to parse version 1 and 2 of the F-Droid index format.