From c45896b98ab3418427d04c92534a3d04d7e68394 Mon Sep 17 00:00:00 2001 From: LegacyGamerHD Date: Thu, 3 Sep 2020 15:47:12 +0200 Subject: [PATCH 01/11] test for singning apk --- keystore.properties | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 keystore.properties diff --git a/keystore.properties b/keystore.properties new file mode 100644 index 0000000000..23d6b5bf5e --- /dev/null +++ b/keystore.properties @@ -0,0 +1,4 @@ +storePassword=store-pass +keyPassword=key-pass +keyAlias=alias +storeFile=test-keystore.jks From 1be7b7403213ffa7ef70a80f0f99143d14b2d310 Mon Sep 17 00:00:00 2001 From: LegacyGamerHD Date: Thu, 3 Sep 2020 15:48:56 +0200 Subject: [PATCH 02/11] Create test-keystore.jks --- test-keystore.jks | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 test-keystore.jks diff --git a/test-keystore.jks b/test-keystore.jks new file mode 100644 index 0000000000..717e682f30 --- /dev/null +++ b/test-keystore.jks @@ -0,0 +1,3 @@ +keytool -genkey -keystore test-keystore.jks -keyalg RSA -keysize 2048 -validity 10000 -alias alias -storepass store-pass -keypass key-pass -dname "CN=a" -noprompt +# keytool is inside "[...]/Android/Android Studio/jre/bin" and "$JAVA_HOME/bin" +# there are many variations of this command that also generate a valid test-keystore.jks From d009fb359a63daf8d57cab2a1f8acad8e26a553d Mon Sep 17 00:00:00 2001 From: LegacyGamerHD Date: Thu, 3 Sep 2020 15:52:58 +0200 Subject: [PATCH 03/11] some changes --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 7ae4b9f7b2..b5e853b22a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -46,9 +46,9 @@ script: - ./gradlew test deploy: - provider: releases + provider: prerelease api-key: $GITHUB_API_KEY - file: $TRAVIS_BUILD_DIR/app/build/outputs/apk/debug/app-debug.apk + file: $TRAVIS_BUILD_DIR/app/build/outputs/apk/debug/app-release.apk skip_cleanup: true name: PojavLauncher_DevBuild-$TRAVIS_COMMIT body: Automatic build of PojavLauncher from the latest source commit ($TRAVIS_COMMIT) built by Travis CI on $(date +'%F %T %Z'). From 7ea0ec1f20a347597b282fa0ac5523f76092e99c Mon Sep 17 00:00:00 2001 From: LegacyGamerHD Date: Thu, 3 Sep 2020 16:00:03 +0200 Subject: [PATCH 04/11] Update .travis.yml --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index b5e853b22a..d5eb5ad4f8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -46,9 +46,9 @@ script: - ./gradlew test deploy: - provider: prerelease + provider: release api-key: $GITHUB_API_KEY - file: $TRAVIS_BUILD_DIR/app/build/outputs/apk/debug/app-release.apk + file: $TRAVIS_BUILD_DIR/app/build/outputs/apk/release/app-release.apk skip_cleanup: true name: PojavLauncher_DevBuild-$TRAVIS_COMMIT body: Automatic build of PojavLauncher from the latest source commit ($TRAVIS_COMMIT) built by Travis CI on $(date +'%F %T %Z'). From 2d49ee8eb13059d94e66f0f442d64b9803a3b208 Mon Sep 17 00:00:00 2001 From: LegacyGamerHD Date: Thu, 3 Sep 2020 16:15:25 +0200 Subject: [PATCH 05/11] Update .travis.yml --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index d5eb5ad4f8..ad32273713 100644 --- a/.travis.yml +++ b/.travis.yml @@ -48,7 +48,7 @@ script: deploy: provider: release api-key: $GITHUB_API_KEY - file: $TRAVIS_BUILD_DIR/app/build/outputs/apk/release/app-release.apk + file: $TRAVIS_BUILD_DIR/app/build/outputs/apk/debug/app-debug.apk skip_cleanup: true name: PojavLauncher_DevBuild-$TRAVIS_COMMIT body: Automatic build of PojavLauncher from the latest source commit ($TRAVIS_COMMIT) built by Travis CI on $(date +'%F %T %Z'). From f9ef2f193bc98a91512f074f727570a7083d42ef Mon Sep 17 00:00:00 2001 From: LegacyGamerHD Date: Thu, 3 Sep 2020 17:05:27 +0200 Subject: [PATCH 06/11] Delete keystore.properties --- keystore.properties | 4 ---- 1 file changed, 4 deletions(-) delete mode 100644 keystore.properties diff --git a/keystore.properties b/keystore.properties deleted file mode 100644 index 23d6b5bf5e..0000000000 --- a/keystore.properties +++ /dev/null @@ -1,4 +0,0 @@ -storePassword=store-pass -keyPassword=key-pass -keyAlias=alias -storeFile=test-keystore.jks From f7d95f2221c62031ebc2f757f120f18809b2e3fd Mon Sep 17 00:00:00 2001 From: LegacyGamerHD Date: Thu, 3 Sep 2020 17:05:37 +0200 Subject: [PATCH 07/11] Delete test-keystore.jks --- test-keystore.jks | 3 --- 1 file changed, 3 deletions(-) delete mode 100644 test-keystore.jks diff --git a/test-keystore.jks b/test-keystore.jks deleted file mode 100644 index 717e682f30..0000000000 --- a/test-keystore.jks +++ /dev/null @@ -1,3 +0,0 @@ -keytool -genkey -keystore test-keystore.jks -keyalg RSA -keysize 2048 -validity 10000 -alias alias -storepass store-pass -keypass key-pass -dname "CN=a" -noprompt -# keytool is inside "[...]/Android/Android Studio/jre/bin" and "$JAVA_HOME/bin" -# there are many variations of this command that also generate a valid test-keystore.jks From 10825d7b747b52263c43f506a9f6c5d078c8651f Mon Sep 17 00:00:00 2001 From: Tran Khanh Duy <40482367+khanhduytran0@users.noreply.github.com> Date: Fri, 4 Sep 2020 12:57:30 +0700 Subject: [PATCH 08/11] GitHub Actions --- .github/workflows/android.yml | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 .github/workflows/android.yml diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml new file mode 100644 index 0000000000..37b98992a1 --- /dev/null +++ b/.github/workflows/android.yml @@ -0,0 +1,22 @@ +name: Android CI + +on: [push] + +jobs: + build: + + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v2 + - name: set up JDK 1.8 + uses: actions/setup-java@v1 + with: + java-version: 1.8 + - name: Build with Gradle + run: ./gradlew build + - name: Upload APK + uses: actions/upload-artifact@v1 + with: + name: app + path: app/build/outputs/apk/debug/app-debug.apk From 938000a041132e76730c7319ba415decc980cb62 Mon Sep 17 00:00:00 2001 From: Tran Khanh Duy <40482367+khanhduytran0@users.noreply.github.com> Date: Fri, 4 Sep 2020 12:59:28 +0700 Subject: [PATCH 09/11] oops put to wrong branch --- .github/workflows/android.yml | 22 ---------------------- 1 file changed, 22 deletions(-) delete mode 100644 .github/workflows/android.yml diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml deleted file mode 100644 index 37b98992a1..0000000000 --- a/.github/workflows/android.yml +++ /dev/null @@ -1,22 +0,0 @@ -name: Android CI - -on: [push] - -jobs: - build: - - runs-on: ubuntu-latest - - steps: - - uses: actions/checkout@v2 - - name: set up JDK 1.8 - uses: actions/setup-java@v1 - with: - java-version: 1.8 - - name: Build with Gradle - run: ./gradlew build - - name: Upload APK - uses: actions/upload-artifact@v1 - with: - name: app - path: app/build/outputs/apk/debug/app-debug.apk From 03cde0b4395b00c0dbd196caab5f81b9cd7d09db Mon Sep 17 00:00:00 2001 From: Tran Khanh Duy <40482367+khanhduytran0@users.noreply.github.com> Date: Sat, 5 Sep 2020 20:28:30 +0700 Subject: [PATCH 10/11] Add files via upload --- app/debug.keystore | Bin 0 -> 1267 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 app/debug.keystore diff --git a/app/debug.keystore b/app/debug.keystore new file mode 100644 index 0000000000000000000000000000000000000000..12fd3e6389a905fef9ecc6bab71d71ad76795355 GIT binary patch literal 1267 zcmezO_TO6u1_mY|W&~sY#JrTE{LGY;)TGk%?9@u2cuDNZ)Ow(r-3Coe+YR{GxU|_A zSs1mL1Q{7w8CaT_7H@UjZu~ZM(NsrvZMS;@v%ha+o2r(>y)s6-!&RXvae{y=d+yAC z8y;P}&oysi`fn5N2~zJ2Ok?>_qhFU;C;DGpzsvX|IoO-&(W<_^um5lO^JsD3 z#s1^*e=c&UPY)MvyuP%?C$($hbg3KHnV+WozruEP0f&scZ=BqdACe~4yZwj8Tj9n9hvvm}beHUn^M2TM(<@~qQ`E9bJBxo6(>JusZZRtG zyL`6x&$|l?cTbz-Tpb%Zw`;y}Hn%{L@b(QaU(fqE)nk6J<)W0d*Sn{8=7zNC-?qHm zJ*#3$)yW^HZgKuR#i5%teanoP&yxcLMHySq!*h*<6&n33 zziXQ3u3B<}b;Eks%blL-=7-W7g1h-o^sJh~?tehs?~VHYhec{NW?a?J-c~Hvh|}7j zkn9{v}O2BT1qAt>x1nM>NB` zuCL?2b$+Jcv?Y^eI^TqpNgarDKK4-XWWfJe@qZy--`BXSe)z}!oOMZNSL1=l9P9pU z|8=bBwag*KJ(ld-4&G*&e5$`??$h`i{ReIt&MWge{rA(4{>GFUA(GLXiao!5UtTpw zZfEb}4d*5Pu-{!$bXQ)+rsYD<$Lc9*rvqzGwJ<&Zx!CW}+C{r7jMD5@%r|{mYj-ux z);MYIw`XSWH`?ws{FlI*ak*O5DDGr?)xV#{oX`Jt1&O_HdAqklO0Lt^*xm5E`svOm zg4zc!AG4c1BWzhMv*oLM{_)CR_t)+Zc4}TW?a5E}#LX73n4b0Qez>*nDUV1D%PVl& zW{uD@HLwJx=obb}j8A~rcL6gKBNG!NqX91)r&gOs+jm|@Ms8LH19L-e15P&PP!={} zrqEzR0br^Ja=3)q9U-~HP|QFCB*HAr3l&jt0c98i1#w;@0|QF~Q$qtILsR1@34S93 zGXnz)BQvM~`9?R+M|LGJ>oGU>G8i;=GBq|bY@WY!mTZh0=kc8Gs2fursh$+lwpLuR zf6>le0jpnE@aJvMJ2%rX_h8e{a%qO$6RYm5H=DCNg1LVGwn=r}SM|H%E^k#gnrV11 zt~V1?^91zt-W^g z!+-5P-$YtOnV11o9lH*Wz&c#O)#tpGBE-YIq;k-&L)Q{o!R`s%hZcqPI`=X}Qh9RYq@wZbmx>yG88z=fk{5 zBz^axrvDpXKYh~NKCQ!2X~k44;Tp}Yzc&`X*m>=NhAC%UXz?fitn6f#SG@ZCBF9%> W^3|()x$>dUK1+#zoV%3@mjM8WStI8F literal 0 HcmV?d00001 From 7aed98b7e364c9488fb9fdd1b849af31e6d318bf Mon Sep 17 00:00:00 2001 From: Tran Khanh Duy <40482367+khanhduytran0@users.noreply.github.com> Date: Sat, 5 Sep 2020 20:33:44 +0700 Subject: [PATCH 11/11] Signing use one debug keystore --- app/build.gradle | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/app/build.gradle b/app/build.gradle index 54e98665c1..94e2e59c19 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -8,6 +8,14 @@ android { lintOptions { abortOnError false } + signingConfigs { + customDebug { + storeFile file("debug.keystore") + storePassword "android" + keyAlias "androiddebugkey" + keyPassword "android" + } + } defaultConfig { applicationId "net.kdt.pojavlaunch" minSdkVersion 21 @@ -18,6 +26,11 @@ android { } buildTypes { + debug { + minifyEnabled false + proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' + signingConfig signingConfigs.customDebug + } release { // Don't set to true or java.awt will be a.a or something similar. minifyEnabled false