diff --git a/.github/actions/publish-release-apk/entrypoint.sh b/.github/actions/publish-release-apk/entrypoint.sh index 9e38ec9..110cc0b 100644 --- a/.github/actions/publish-release-apk/entrypoint.sh +++ b/.github/actions/publish-release-apk/entrypoint.sh @@ -2,6 +2,6 @@ ls -a git config --global --add safe.directory /github/workspace -hub checkout ${${REPO_BRANCH}:-master} +hub checkout ${REPO_BRANCH:-master} VERSION_NAME=`grep -oP 'versionName = "\K(.*?)(?=")' ./${APP_FOLDER}/build.gradle.kts` hub release create -a ./${APP_FOLDER}/build/outputs/apk/${BUILD_FLAVOR}/${BUILD_TYPE}/*-${BUILD_TYPE}.apk -m "${RELEASE_TITLE} - v${VERSION_NAME}" v${VERSION_NAME}${TAG_SUFFIX} diff --git a/.github/workflows/build_check.yml b/.github/workflows/build_check.yml index 80e3a9a..699dd1e 100644 --- a/.github/workflows/build_check.yml +++ b/.github/workflows/build_check.yml @@ -12,10 +12,10 @@ jobs: steps: - uses: actions/checkout@v3 - - name: set up JDK 22 + - name: set up JDK 21 uses: actions/setup-java@v3 with: - java-version: '22' + java-version: '21' distribution: 'oracle' cache: gradle diff --git a/.github/workflows/publish_debug.yml b/.github/workflows/publish_debug.yml index 544dc2d..b1d8b09 100644 --- a/.github/workflows/publish_debug.yml +++ b/.github/workflows/publish_debug.yml @@ -12,10 +12,10 @@ jobs: steps: - uses: actions/checkout@v3 - - name: set up JDK 22 + - name: set up JDK 21 uses: actions/setup-java@v3 with: - java-version: '22' + java-version: '21' distribution: 'oracle' cache: gradle diff --git a/.github/workflows/publish_release.yml b/.github/workflows/publish_release.yml index 6e4b69f..8d07790 100644 --- a/.github/workflows/publish_release.yml +++ b/.github/workflows/publish_release.yml @@ -13,10 +13,10 @@ jobs: steps: - uses: actions/checkout@v3 - - name: set up JDK 22 + - name: set up JDK 21 uses: actions/setup-java@v3 with: - java-version: '22' + java-version: '21' distribution: 'oracle' cache: gradle diff --git a/app/build.gradle.kts b/app/build.gradle.kts index fc6f42c..76d20db 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -26,8 +26,8 @@ android { minSdk = 29 targetSdk = 35 - versionCode = 1708536358 - versionName = "0.26.2-beta" + versionCode = 1708536360 + versionName = "0.26.4-beta" testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" @@ -220,6 +220,6 @@ enum class JavaConfig(val jvmTarget: String, val jdkVersion: Int, val javaVersio } } - private val DEFAULT = JAVA_22 + private val DEFAULT = JAVA_21 } } \ No newline at end of file