diff --git a/.github/workflows/gradle_build.yml b/.github/workflows/gradle_build.yml index 13b3ccc..709b49e 100644 --- a/.github/workflows/gradle_build.yml +++ b/.github/workflows/gradle_build.yml @@ -1,7 +1,7 @@ # This workflow ensures the building step works # # @author Armin Schnabel -# @version 1.0.0 +# @version 1.0.1 # @since 1.0.0 name: Gradle Build @@ -9,20 +9,20 @@ on: push: branches: - main - - release pull_request: branches: - main - - release jobs: build: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v1 + - name: Checkout Repository + uses: actions/checkout@v3 + - name: Set up JDK 11 - uses: actions/setup-java@v2 + uses: actions/setup-java@v3 with: distribution: 'zulu' java-version: '11' diff --git a/.github/workflows/gradle_publish.yml b/.github/workflows/gradle_publish.yml index a9519ae..8627cfb 100644 --- a/.github/workflows/gradle_publish.yml +++ b/.github/workflows/gradle_publish.yml @@ -1,7 +1,7 @@ # This workflow publishes a new version to the Github Registry. # # @author Armin Schnabel -# @version 1.0.0 +# @version 1.0.1 # @since 1.0.0 name: Gradle Publish @@ -15,25 +15,34 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v1 + - name: Checkout Repository + uses: actions/checkout@v3 + - name: Set up JDK 11 - uses: actions/setup-java@v2 + uses: actions/setup-java@v3 with: distribution: 'zulu' java-version: '11' - name: Add gradle.properties run: | - # Use the repository's automatically set up token to pushlish to the registry + # Use the repository's automatically set up token to publish to the registry cp gradle.properties.template gradle.properties echo "githubUser=${{ github.actor }}" >> gradle.properties echo "githubToken=${{ secrets.GITHUB_TOKEN }}" >> gradle.properties + # version is required to publish artifacts to Github Registry + - name: Set version + run: | + sed -i "s/version = \"0.0.0\"/version = \"${{ github.ref_name }}\"/g" build.gradle + + # Publish slim JARS to Github Package Registry - name: Publish with Gradle run: ./gradlew publish - # Automatically mark this tag as release on Github - - uses: actions/create-release@v1 + # Automatically mark this tag as release on Github + - name: Mark tag as release on Github + uses: actions/create-release@v1 id: create_release with: tag_name: ${{ github.ref }} diff --git a/README.adoc b/README.adoc index cb826bf..c84860a 100644 --- a/README.adoc +++ b/README.adoc @@ -7,7 +7,7 @@ This Gradle Plugin is currently only tested with Gradle 7. [[license]] == License -Copyright 2021 Cyface GmbH +Copyright 2021-2023 Cyface GmbH This file is part of the Cyface Publish Plugin for Android. diff --git a/build.gradle b/build.gradle index 1396109..f7251b1 100644 --- a/build.gradle +++ b/build.gradle @@ -1,5 +1,5 @@ /* - * Copyright 2021 Cyface GmbH + * Copyright 2021-2023 Cyface GmbH * * This file is part of the Cyface Publish Plugin for Android. * @@ -18,13 +18,15 @@ */ buildscript { + ext.gradle_version = '7.4.2' + repositories { google() mavenCentral() gradlePluginPortal() } dependencies { - classpath("com.android.tools.build:gradle:7.0.1") + classpath "com.android.tools.build:gradle:$gradle_version" } } @@ -34,7 +36,7 @@ plugins { } group = "de.cyface" -version = "1.0.1" +version = "0.0.0" // Automatically overwritten by CI repositories { gradlePluginPortal() // so that external plugins can be resolved in dependencies section diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 7454180..943f0cb 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index ffed3a2..5083229 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.1-bin.zip +networkTimeout=10000 zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew index 1b6c787..65dcd68 100755 --- a/gradlew +++ b/gradlew @@ -55,7 +55,7 @@ # Darwin, MinGW, and NonStop. # # (3) This script is generated from the Groovy template -# https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt # within the Gradle project. # # You can find Gradle at https://github.com/gradle/gradle/. @@ -80,10 +80,10 @@ do esac done -APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit - -APP_NAME="Gradle" +# This is normally unused +# shellcheck disable=SC2034 APP_BASE_NAME=${0##*/} +APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' @@ -143,12 +143,16 @@ fi if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then case $MAX_FD in #( max*) + # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC3045 MAX_FD=$( ulimit -H -n ) || warn "Could not query maximum file descriptor limit" esac case $MAX_FD in #( '' | soft) :;; #( *) + # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC3045 ulimit -n "$MAX_FD" || warn "Could not set maximum file descriptor limit to $MAX_FD" esac @@ -205,6 +209,12 @@ set -- \ org.gradle.wrapper.GradleWrapperMain \ "$@" +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" +fi + # Use "xargs" to parse quoted args. # # With -n1 it outputs one arg per line, with the quotes and backslashes removed. diff --git a/gradlew.bat b/gradlew.bat index ac1b06f..6689b85 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -14,7 +14,7 @@ @rem limitations under the License. @rem -@if "%DEBUG%" == "" @echo off +@if "%DEBUG%"=="" @echo off @rem ########################################################################## @rem @rem Gradle startup script for Windows @@ -25,7 +25,8 @@ if "%OS%"=="Windows_NT" setlocal set DIRNAME=%~dp0 -if "%DIRNAME%" == "" set DIRNAME=. +if "%DIRNAME%"=="" set DIRNAME=. +@rem This is normally unused set APP_BASE_NAME=%~n0 set APP_HOME=%DIRNAME% @@ -40,7 +41,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome set JAVA_EXE=java.exe %JAVA_EXE% -version >NUL 2>&1 -if "%ERRORLEVEL%" == "0" goto execute +if %ERRORLEVEL% equ 0 goto execute echo. echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. @@ -75,13 +76,15 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar :end @rem End local scope for the variables with windows NT shell -if "%ERRORLEVEL%"=="0" goto mainEnd +if %ERRORLEVEL% equ 0 goto mainEnd :fail rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of rem the _cmd.exe /c_ return code! -if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 -exit /b 1 +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% :mainEnd if "%OS%"=="Windows_NT" endlocal