From f1396d0de08182cd09346faf039a76c25b9b8198 Mon Sep 17 00:00:00 2001 From: Arie Trouw Date: Wed, 3 Feb 2021 12:57:24 -0800 Subject: [PATCH 1/3] moved classed back to base for proguard --- .github/workflows/release-maven.yml | 52 +++++++++++++++++++ base-android-library/build.gradle | 4 +- .../network/xyo/{helpers => base}/Helpers.kt | 0 .../main/kotlin/network/xyo/base/XYBase.kt | 3 -- .../xyo/{logging => base}/XYLogging.kt | 2 +- .../network/xyo/{random => base}/XYRandom.kt | 3 +- base-android-library/version.properties | 2 +- 7 files changed, 57 insertions(+), 9 deletions(-) create mode 100644 .github/workflows/release-maven.yml rename base-android-library/src/main/kotlin/network/xyo/{helpers => base}/Helpers.kt (100%) rename base-android-library/src/main/kotlin/network/xyo/{logging => base}/XYLogging.kt (98%) rename base-android-library/src/main/kotlin/network/xyo/{random => base}/XYRandom.kt (91%) diff --git a/.github/workflows/release-maven.yml b/.github/workflows/release-maven.yml new file mode 100644 index 0000000..f887bf1 --- /dev/null +++ b/.github/workflows/release-maven.yml @@ -0,0 +1,52 @@ +name: Release + +on: + push: + branches: + - "master" + +jobs: + publish: + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@master + - uses: actions/setup-java@v1 + with: + java-version: 1.8 + - name: pre-build + run: chmod +x gradlew + - name: install + run: ./gradlew install + - name: assemble + run: ./gradlew :base-android-library:assembleRelease + - name: print version + run: | + echo "##[set-output name=version;]$(gradle -q printVersion)" + id: release_version + env: + ACTIONS_ALLOW_UNSECURE_COMMANDS: "true" + - name: maven upload + env: + MAVEN_USER: ${{ secrets.BINTRAY_USER }} + MAVEN_KEY: ${{ secrets.BINTRAY_KEY }} + run: ./gradlew :base-android-library:mavenUpload + - name: get commit message + run: | + echo ::set-env name=commitmsg::$(git log --format=%B -n 1 ${{ github.event.after }}) + env: + ACTIONS_ALLOW_UNSECURE_COMMANDS: "true" + - name: show commit message + run: echo $commitmsg + env: + ACTIONS_ALLOW_UNSECURE_COMMANDS: "true" + - name: Create Release + id: create_release + uses: actions/create-release@v1 + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + with: + tag_name: ${{ steps.release_version.outputs.version }} + release_name: Release ${{ env.commitmsg }} + draft: true + prerelease: false diff --git a/base-android-library/build.gradle b/base-android-library/build.gradle index da87585..b24394f 100644 --- a/base-android-library/build.gradle +++ b/base-android-library/build.gradle @@ -121,8 +121,8 @@ publishing { } bintray { - user = System.getenv('BINTRAY_USER') - key = System.getenv('BINTRAY_KEY') + user = System.getenv('MAVEN_USER') + key = System.getenv('MAVEN_KEY') dryRun = false override = false publish = true diff --git a/base-android-library/src/main/kotlin/network/xyo/helpers/Helpers.kt b/base-android-library/src/main/kotlin/network/xyo/base/Helpers.kt similarity index 100% rename from base-android-library/src/main/kotlin/network/xyo/helpers/Helpers.kt rename to base-android-library/src/main/kotlin/network/xyo/base/Helpers.kt diff --git a/base-android-library/src/main/kotlin/network/xyo/base/XYBase.kt b/base-android-library/src/main/kotlin/network/xyo/base/XYBase.kt index dc2606f..a1031d1 100644 --- a/base-android-library/src/main/kotlin/network/xyo/base/XYBase.kt +++ b/base-android-library/src/main/kotlin/network/xyo/base/XYBase.kt @@ -3,10 +3,7 @@ package network.xyo.base import android.app.Activity import android.content.Context import android.content.ContextWrapper -import android.os.Debug -import com.jaredrummler.android.device.DeviceName import network.xyo.helpers.classNameFromObject -import network.xyo.logging.XYLogging open class XYBase { diff --git a/base-android-library/src/main/kotlin/network/xyo/logging/XYLogging.kt b/base-android-library/src/main/kotlin/network/xyo/base/XYLogging.kt similarity index 98% rename from base-android-library/src/main/kotlin/network/xyo/logging/XYLogging.kt rename to base-android-library/src/main/kotlin/network/xyo/base/XYLogging.kt index b7116df..abc21b0 100644 --- a/base-android-library/src/main/kotlin/network/xyo/logging/XYLogging.kt +++ b/base-android-library/src/main/kotlin/network/xyo/base/XYLogging.kt @@ -1,4 +1,4 @@ -package network.xyo.logging +package network.xyo.base import android.util.Log import network.xyo.helpers.classNameFromObject diff --git a/base-android-library/src/main/kotlin/network/xyo/random/XYRandom.kt b/base-android-library/src/main/kotlin/network/xyo/base/XYRandom.kt similarity index 91% rename from base-android-library/src/main/kotlin/network/xyo/random/XYRandom.kt rename to base-android-library/src/main/kotlin/network/xyo/base/XYRandom.kt index 9d5f2ef..8524047 100644 --- a/base-android-library/src/main/kotlin/network/xyo/random/XYRandom.kt +++ b/base-android-library/src/main/kotlin/network/xyo/base/XYRandom.kt @@ -1,6 +1,5 @@ -package network.xyo.random +package network.xyo.base -import network.xyo.base.XYBase import java.util.* class XYRandom : XYBase() { diff --git a/base-android-library/version.properties b/base-android-library/version.properties index 75a3ca2..7225171 100644 --- a/base-android-library/version.properties +++ b/base-android-library/version.properties @@ -1,2 +1,2 @@ -#Wed Feb 03 19:27:56 UTC 2021 +#Wed Feb 03 12:56:41 PST 2021 VERSION_PATCH=11 From 265336b6acaf5494f766c49d66f289daee320f7e Mon Sep 17 00:00:00 2001 From: Arie Trouw Date: Wed, 3 Feb 2021 12:58:01 -0800 Subject: [PATCH 2/3] no need for jfrog --- .github/workflows/release-maven.yml | 52 ----------------------------- 1 file changed, 52 deletions(-) delete mode 100644 .github/workflows/release-maven.yml diff --git a/.github/workflows/release-maven.yml b/.github/workflows/release-maven.yml deleted file mode 100644 index f887bf1..0000000 --- a/.github/workflows/release-maven.yml +++ /dev/null @@ -1,52 +0,0 @@ -name: Release - -on: - push: - branches: - - "master" - -jobs: - publish: - runs-on: ubuntu-latest - - steps: - - uses: actions/checkout@master - - uses: actions/setup-java@v1 - with: - java-version: 1.8 - - name: pre-build - run: chmod +x gradlew - - name: install - run: ./gradlew install - - name: assemble - run: ./gradlew :base-android-library:assembleRelease - - name: print version - run: | - echo "##[set-output name=version;]$(gradle -q printVersion)" - id: release_version - env: - ACTIONS_ALLOW_UNSECURE_COMMANDS: "true" - - name: maven upload - env: - MAVEN_USER: ${{ secrets.BINTRAY_USER }} - MAVEN_KEY: ${{ secrets.BINTRAY_KEY }} - run: ./gradlew :base-android-library:mavenUpload - - name: get commit message - run: | - echo ::set-env name=commitmsg::$(git log --format=%B -n 1 ${{ github.event.after }}) - env: - ACTIONS_ALLOW_UNSECURE_COMMANDS: "true" - - name: show commit message - run: echo $commitmsg - env: - ACTIONS_ALLOW_UNSECURE_COMMANDS: "true" - - name: Create Release - id: create_release - uses: actions/create-release@v1 - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - with: - tag_name: ${{ steps.release_version.outputs.version }} - release_name: Release ${{ env.commitmsg }} - draft: true - prerelease: false From 4e01302982b708f57ca9418db35e73d09d74f4b3 Mon Sep 17 00:00:00 2001 From: GitHub Action Date: Wed, 3 Feb 2021 20:59:56 +0000 Subject: [PATCH 3/3] version bump --- base-android-library/version.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/base-android-library/version.properties b/base-android-library/version.properties index 7225171..e3783fa 100644 --- a/base-android-library/version.properties +++ b/base-android-library/version.properties @@ -1,2 +1,2 @@ -#Wed Feb 03 12:56:41 PST 2021 -VERSION_PATCH=11 +#Wed Feb 03 20:59:18 UTC 2021 +VERSION_PATCH=12