Merge pull request #294 from rpavlik/auto-release-aar

Auto release aar

Author: rpavlik

maintainer-scripts/build-and-publish-aar-mavencentral.sh

@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-# Copyright (c) 2020-2021 Collabora, Ltd.
+# Copyright (c) 2020-2022 Collabora, Ltd.
 #
 # SPDX-License-Identifier: Apache-2.0
 set -e
@@ -15,3 +15,6 @@ rm -f "${ROOT}/SNAPSHOT"
 # Publish AAR using Gradle
 cd "${MAINT_SCRIPTS}/publish-aar"
 ./gradlew publishMavenPublicationToBuildDirRepository publishMavenPublicationToOSSRHRepository
+
+# Need to explicitly "close and release" it then
+./gradlew closeAndReleaseRepository

maintainer-scripts/publish-aar/build.gradle.kts

@@ -1,8 +1,9 @@
-// Copyright 2021, Collabora, Ltd.
+// Copyright 2021-2022, Collabora, Ltd.
 // SPDX-License-Identifier: BSL-1.0
 plugins {
     id("maven-publish")
     signing
+    id("io.codearte.nexus-staging").version("0.30.0")
 }
 
 // These next few lines are just to make the version match the OpenXR release.
@@ -94,3 +95,8 @@ publishing {
         }
     }
 }
+nexusStaging {
+    serverUrl = "https://s01.oss.sonatype.org/service/local/"
+    username = System.getenv("OSSRH_USER") ?: return@nexusStaging
+    password = System.getenv("OSSRH_PASSWORD") ?: return@nexusStaging
+}

maintainer-scripts/publish-aar/gradle/wrapper/gradle-wrapper.jar

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

maintainer-scripts/publish-aar/gradle/wrapper/gradle-wrapper.properties

@@ -42,7 +42,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome
 
 set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto init
+if "%ERRORLEVEL%" == "0" goto execute
 
 echo.
 echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
@@ -56,7 +56,7 @@ goto fail
 set JAVA_HOME=%JAVA_HOME:"=%
 set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
-if exist "%JAVA_EXE%" goto init
+if exist "%JAVA_EXE%" goto execute
 
 echo.
 echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
@@ -66,29 +66,14 @@ echo location of your Java installation.
 
 goto fail
 
-:init
-@rem Get command-line arguments, handling Windows variants
-
-if not "%OS%" == "Windows_NT" goto win9xME_args
-
-:win9xME_args
-@rem Slurp the command line arguments.
-set CMD_LINE_ARGS=
-set _SKIP=2
-
-:win9xME_args_slurp
-if "x%~1" == "x" goto execute
-
-set CMD_LINE_ARGS=%*
-
 :execute
 @rem Setup the command line
 
 set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 
 
 @rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
 
 :end
 @rem End local scope for the variables with windows NT shell