diff --git a/.github/workflows/firebase_cd.yml b/.github/workflows/firebase_cd.yml index 8a68ef53..b1ea1b9c 100644 --- a/.github/workflows/firebase_cd.yml +++ b/.github/workflows/firebase_cd.yml @@ -13,29 +13,32 @@ jobs: - name: Setup JDK 17 uses: actions/setup-java@v3 with: - distribution: zulu - java-version: 17 + distribution: zulu + java-version: 17 - name: Create Local Properties run: | echo "${{ secrets.PPAC_LOCAL_PROPERTIES }}" > ./local.properties - - name: Create Google Services - run: | - echo "${{ secrets.PPAC_GOOGLE_SERVICES }}" > ./app/google-services.json + - name: Create file + run: cat /home/runner/work/ppac-android/ppac-android/app/google-services.json | base64 + + - name: Putting data + env: + DATA: ${{ secrets.PPAC_GOOGLE_SERVICES }} + run: echo $DATA > /home/runner/work/ppac-android/ppac-android/app/google-services.json - name: Create KeyStore Properties run: | - echo "${{ secrets.PPAC_KEYSTORE_PROPERTIES }}" > ./app/signing/farmeme-keystore.properties + echo "${{ secrets.PPAC_KEYSTORE_PROPERTIES }}" > ./farmeme-keystore.properties - name: Build APK - run: ./gradlew assembleRelease PstorePassword=${{secrets.PPAC_KEYSTORE_PASSWORD}} PkeyPassword=${{secrets.PPAC_ALIAS_PASSWORD}} + run: ./gradlew assembleDebug - name: Upload Build to Firebase App Distribution uses: wzieba/Firebase-Distribution-Github-Action@v1 with: - appId: ${{ secrets.PPAC_FIREBASE_APP_ID }} - serviceCredentialsFileContent: ${{ secrets.PPAC_FIREBASE_CREDENTIAL }} - groups: android-tester - file: app/build/outputs/apk/release/app-release.apk - # app/build/outputs/apk/standard/stage/release/app-standard-stage-release.apk \ No newline at end of file + appId: ${{ secrets.PPAC_FIREBASE_APP_ID }} + serviceCredentialsFileContent: ${{ secrets.PPAC_FIREBASE_CREDENTIAL }} + groups: android-tester + file: app/build/outputs/apk/debug/app-debug.apk \ No newline at end of file diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 37dc513e..8d7ba25a 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -9,7 +9,7 @@ plugins { alias(libs.plugins.google.services) } -val keystorePropertiesFile = rootProject.file("app/signing/farmeme-keystore.properties") +val keystorePropertiesFile = File("farmeme-keystore.properties") android { namespace = libs.versions.namespace.get() compileSdk = libs.versions.compileSdk.get().toInt() @@ -33,7 +33,7 @@ android { create("release") { val keystoreProperties = Properties() keystoreProperties.load(FileInputStream(keystorePropertiesFile)) - storeFile = file("signing/farmeme-keystore.jks") + storeFile = file("farmeme-keystore.jks") keyAlias = keystoreProperties.getProperty("keyAlias") keyPassword = keystoreProperties.getProperty("keyPassword") storePassword = keystoreProperties.getProperty("storePassword") diff --git a/core/common/android/src/test/java/team/ppac/common/android/ExampleUnitTest.kt b/core/common/android/src/test/java/team/ppac/common/android/ExampleUnitTest.kt deleted file mode 100644 index 6df1eedc..00000000 --- a/core/common/android/src/test/java/team/ppac/common/android/ExampleUnitTest.kt +++ /dev/null @@ -1,17 +0,0 @@ -package team.ppac.common.android - -import org.junit.Test - -import org.junit.Assert.* - -/** - * Example local unit test, which will execute on the development machine (host). - * - * See [testing documentation](http://d.android.com/tools/testing). - */ -class ExampleUnitTest { - @Test - fun addition_isCorrect() { - assertEquals(4, 2 + 2) - } -} \ No newline at end of file