Update to AGP 8.6.1, add support for 16kB page sizes

Author: maurhofer-ubique

.github/workflows/android.yml

@@ -20,6 +20,6 @@ jobs:
       - name: Build with Gradle
         env:
           UB_ARTIFACTORY_URL_ANDROID: ${{secrets.UBIQUE_ARTIFACTORY_URL}}
-          UB_ARTIFACTORY_USERNAME: ${{secrets.UBIQUE_ARTIFACTORY_USER}}
+          UB_ARTIFACTORY_USER: ${{secrets.UBIQUE_ARTIFACTORY_USER}}
           UB_ARTIFACTORY_PASSWORD: ${{secrets.UBIQUE_ARTIFACTORY_PASS}}
         run: cd android; chmod 0777 gradlew; ./gradlew assembleDebug -P'android.injected.build.abi=arm64-v8a'

.github/workflows/sonatype.yml

@@ -38,7 +38,7 @@ jobs:
           SIGNING_KEY_ID: ${{secrets.MAVEN_SIGNING_KEY_ID}}
           SIGNING_KEY_PASSWORD: ${{secrets.MAVEN_SIGNING_KEY_PASSPHRASE}}
           UB_ARTIFACTORY_URL_ANDROID: ${{secrets.UBIQUE_ARTIFACTORY_URL}}
-          UB_ARTIFACTORY_USERNAME: ${{secrets.UBIQUE_ARTIFACTORY_USER}}
+          UB_ARTIFACTORY_USER: ${{secrets.UBIQUE_ARTIFACTORY_USER}}
           UB_ARTIFACTORY_PASSWORD: ${{secrets.UBIQUE_ARTIFACTORY_PASS}}
         run: |
           cd android
@@ -55,13 +55,13 @@ jobs:
           SONATYPE_NEXUS_USERNAME: ${{secrets.SONATYPE_NEXUS_USERNAME}}
           SONATYPE_NEXUS_PASSWORD: ${{secrets.SONATYPE_NEXUS_PASSWORD}}
           UB_ARTIFACTORY_URL_ANDROID: ${{secrets.UBIQUE_ARTIFACTORY_URL}}
-          UB_ARTIFACTORY_USERNAME: ${{secrets.UBIQUE_ARTIFACTORY_USER}}
+          UB_ARTIFACTORY_USER: ${{secrets.UBIQUE_ARTIFACTORY_USER}}
           UB_ARTIFACTORY_PASSWORD: ${{secrets.UBIQUE_ARTIFACTORY_PASS}}
         run: |
           cd android
           chmod 0777 gradlew
           echo "### Maven Dependency - Maven Central" >> $GITHUB_STEP_SUMMARY
-          ./gradlew publishAllPublicationsToMavenCentral -Psigning.secretKeyRingFile=$GITHUB_WORKSPACE/signingkey.gpg -Psigning.password=$SIGNING_KEY_PASSWORD -Psigning.keyId=$SIGNING_KEY_ID -PmavenCentralUsername=$SONATYPE_NEXUS_USERNAME -PmavenCentralPassword=$SONATYPE_NEXUS_PASSWORD
+          ./gradlew publishAndReleaseToMavenCentral -Psigning.secretKeyRingFile=$GITHUB_WORKSPACE/signingkey.gpg -Psigning.password=$SIGNING_KEY_PASSWORD -Psigning.keyId=$SIGNING_KEY_ID -PmavenCentralUsername=$SONATYPE_NEXUS_USERNAME -PmavenCentralPassword=$SONATYPE_NEXUS_PASSWORD
               echo "[Maven Central](https://search.maven.org/artifact/ch.admin.geo.openswissmaps/${{ steps.vars.outputs.artifactId }}/${{ steps.vars.outputs.version }}/aar)" >> $GITHUB_STEP_SUMMARY
               echo "| Git Commit | Artifact ID | Maven Version |" >> $GITHUB_STEP_SUMMARY
               echo "| --- | --- | --- |" >> $GITHUB_STEP_SUMMARY

CHANGELOG.md

@@ -1,5 +1,11 @@
 # Open Swiss Maps SDK
 
+## Version 2.6.0-16kB
+- Update [mapscore to 2.6.0-16kB](https://github.com/openmobilemaps/maps-core/releases/tag/2.6.0-16kB)
+- Update [gps-layer to 2.6.0-16kB](https://github.com/openmobilemaps/layer-gps/releases/tag/2.6.0-16kB)
+- Update to AGP 8.6.1
+- Support for 16KB page sizes on Android
+
 ## Version 2.6.0
 - Update [mapscore to 2.6.0](https://github.com/openmobilemaps/maps-core/releases/tag/2.6.0)
 - Update [gps-layer to 2.6.0](https://github.com/openmobilemaps/layer-gps/releases/tag/2.6.0)

android/build.gradle

@@ -1,5 +1,3 @@
-import com.vanniktech.maven.publish.SonatypeHost
-
 buildscript {
 	ext.readProperty = { paramName -> readPropertyWithDefault(paramName, null) }
 	ext.readPropertyWithDefault = { paramName, defaultValue ->
@@ -42,10 +40,10 @@ buildscript {
 		mavenCentral()
 	}
 	dependencies {
-		classpath 'com.android.tools.build:gradle:8.2.2'
+		classpath 'com.android.tools.build:gradle:8.6.1'
 		classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
 
-		classpath 'com.vanniktech:gradle-maven-publish-plugin:0.25.3'
+		classpath 'com.vanniktech:gradle-maven-publish-plugin:0.33.0'
 		classpath 'org.jetbrains.dokka:dokka-gradle-plugin:1.9.10'
 	}
 }
@@ -75,8 +73,8 @@ android {
 		consumerProguardFiles 'consumer-rules.pro'
 		externalNativeBuild {
 			cmake {
-				arguments "-DANDROID_STL=c++_shared"
-				cppFlags "-std=c++17 -frtti -fexceptions -O0 "
+				arguments "-DANDROID_STL=c++_shared", "-DANDROID_SUPPORT_FLEXIBLE_PAGE_SIZES=ON"
+				cppFlags "-std=c++17 -frtti -fexceptions -O2"
 			}
 		}
 	}
@@ -138,6 +136,8 @@ android {
 		}
 	}
 
+	// Latest LTS version (as of July 2025)
+	ndkVersion "27.2.12479018"
 }
 
 project.tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).configureEach {
@@ -177,7 +177,7 @@ publishing {
 }
 
 mavenPublishing {
-	publishToMavenCentral(SonatypeHost.S01, true)
+	publishToMavenCentral(true)
 	signAllPublications()
 }
 
@@ -188,8 +188,8 @@ dependencies {
 	implementation "androidx.lifecycle:lifecycle-runtime-ktx:2.6.2"
 	implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.3"
 
-	api "io.openmobilemaps:mapscore:2.6.0"
-	api "io.openmobilemaps:layer-gps:2.6.0"
+	api "io.openmobilemaps:mapscore:2.6.0-16kb"
+	api "io.openmobilemaps:layer-gps:2.6.0-16kb"
 	implementation "ch.ubique.android:djinni-support-lib:1.0.7"
 
 	testImplementation 'junit:junit:4.13.2'

android/gradle.properties

@@ -29,8 +29,8 @@ android.enableR8.fullMode=false
 GROUP=ch.admin.geo.openswissmaps
 POM_ARTIFACT_ID=openswissmaps-sdk
 
-VERSION_NAME=2.6.0
-VERSION_CODE=2060000
+VERSION_NAME=2.6.0-16kb
+VERSION_CODE=2060001
 
 PUBLISH_VARIANT=release
 

android/gradle/wrapper/gradle-wrapper.properties

@@ -13,4 +13,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip