Merge pull request #24 from ngageoint/mage-1603

[mage-1603]
geopackage-android version 6.7.5

Author: nruss11-om

.github/workflows/publish-to-staging.yml

@@ -0,0 +1,36 @@
+name: Publish and close to staging repo
+#Uploads to a new staging repository and closes it, making it available for viewing on the Maven portal
+#The repo will then need to be manually released on the portal before it is available on Maven Central
+on:
+  release:
+    types: [published]
+  #manual triggering
+  workflow_dispatch:
+
+jobs:
+  publish:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+
+      - name: Set up JDK 17
+        uses: actions/setup-java@v4
+        with:
+          java-version: '17'
+          distribution: 'temurin'
+          cache: 'gradle'
+
+      - name: Grant execute permission for gradlew
+        run: chmod +x gradlew
+
+      - name: Publish and Close Sonatype Staging Repository
+        env:
+          SONATYPE_USERNAME: ${{ secrets.SONATYPE_USERNAME }}
+          SONATYPE_PASSWORD: ${{ secrets.SONATYPE_PASSWORD }}
+          GPG_PRIVATE_KEY: ${{ secrets.GPG_PRIVATE_KEY }}
+          GPG_PASSWORD: ${{ secrets.GPG_PASSWORD }}
+        run: |
+          # publishToSonatype: Uploads artifacts to a new staging repository.
+          # closeSonatypeRepository: Closes the staging repository, running validations and making it visible in the portal.
+          ./gradlew publishToSonatype closeSonatypeStagingRepository --no-scan

CHANGELOG.md

@@ -4,9 +4,9 @@ Adheres to [Semantic Versioning](http://semver.org/).
 
 ---
 
-## 6.7.5 (TBD)
+## 6.7.5
 
-* TBD
+* geopackage-android version 6.7.5
 
 ## [6.7.4](https://github.com/ngageoint/geopackage-android-map/releases/tag/6.7.4) (04-05-2024)
 

build.gradle

@@ -1,20 +1,57 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 buildscript {
+    ext.kotlin_version = '1.8.20'
+
     repositories {
         google()
         mavenCentral()
         mavenLocal()
+
+
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:8.3.1'
-        classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1'
+        classpath 'com.android.tools.build:gradle:8.3.2'
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
     }
 }
 
+plugins {
+    id "io.github.gradle-nexus.publish-plugin" version "2.0.0"
+}
+
 allprojects {
+    group = "mil.nga.geopackage.map"
+    version = "6.7.5"
+
     repositories {
         google()
         mavenCentral()
         mavenLocal()
     }
 }
+
+nexusPublishing {
+    repositories {
+        sonatype {
+            nexusUrl = uri("https://ossrh-staging-api.central.sonatype.com/service/local/")
+
+            username = System.getenv("SONATYPE_USERNAME")
+            password = System.getenv("SONATYPE_PASSWORD")
+        }
+    }
+}
+
+subprojects {
+    apply plugin: 'signing' //apply signing plugin to all subprojects
+
+    afterEvaluate {
+        def signingKey = System.getenv("GPG_PRIVATE_KEY")
+        def signingPassword = System.getenv("GPG_PASSWORD")
+        if (signingKey != null && signingPassword != null) {
+            signing {
+                useInMemoryPgpKeys(signingKey, signingPassword)
+                sign publishing.publications
+            }
+        }
+    }
+}

geopackage-map/build.gradle

@@ -1,10 +1,10 @@
-apply plugin: 'com.android.library'
-apply plugin: 'maven-publish'
-apply plugin: 'signing'
+plugins {
+    id "com.android.library"
+    id "maven-publish"
+}
+
 
-group = "mil.nga.geopackage.map"
 archivesBaseName = "geopackage-android-map"
-version = "6.7.5"
 
 android {
     namespace 'mil.nga.geopackage.map'
@@ -109,7 +109,7 @@ afterEvaluate {
 
                 groupId = group
                 artifactId = archivesBaseName
-                version = version
+
                 pom {
                     name = 'GeoPackage Android Map'
                     packaging = 'aar'
@@ -137,33 +137,16 @@ afterEvaluate {
 
                     developers {
                         developer {
-                            id = 'bosborn'
-                            name = 'Brian Osborn'
-                            email = 'bosborn@caci.com'
-                            organizationUrl = 'https://www.caci.com/bit-systems'
+                            id = 'nruss11-om'
+                            name = 'Nathan Russell'
+                            email = 'nathan.russell@omnifederal.com'
+                            organizationUrl = 'https://omnifederal.com/'
                             timezone = 'UTC-07'
                         }
                     }
                 }
             }
         }
-        repositories {
-            maven {
-                def releasesRepoUrl = "https://oss.sonatype.org/service/local/staging/deploy/maven2/"
-                def snapshotsRepoUrl = "https://oss.sonatype.org/content/repositories/snapshots/"
-                url = version.endsWith('SNAPSHOT') ? snapshotsRepoUrl : releasesRepoUrl
-                def user = project.hasProperty('ossrhUsername') ? ossrhUsername : ""
-                def pw = project.hasProperty('ossrhPassword') ? ossrhPassword : ""
-                credentials {
-                    username = user
-                    password = pw
-                }
-            }
-        }
-    }
-
-    signing {
-        sign publishing.publications.maven
     }
 }
 

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Wed Mar 20 08:28:15 MDT 2024
+#Fri Oct 03 01:23:44 CDT 2025
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.10-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists