diff --git a/.github/workflows/firebase-deploy.yml b/.github/workflows/firebase-deploy.yml index f13adb3..fae2345 100644 --- a/.github/workflows/firebase-deploy.yml +++ b/.github/workflows/firebase-deploy.yml @@ -6,34 +6,36 @@ on: - release # Only in release branch jobs: - build: + deploy: runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 - with: - path: android - name: Setup JDK uses: actions/setup-java@v3 with: distribution: 'oracle' java-version: '17' + cache: 'gradle' - name: Generate Keystore env: KEYSTORE_B64: ${{ secrets.APP_KEYSTORE }} run: | echo $KEYSTORE_B64 > keystore_b64.txt base64 --decode --ignore-garbage keystore_b64.txt > keystore.jks - + working-directory: ./android/app + - name: Build Release APK env: SIGNING_KEY_ALIAS: ${{ secrets.KEY_ALIAS }} SIGNING_PASSWORD: ${{ secrets.KEY_PASSWORD }} run: ./gradlew assembleRelease + working-directory: ./android - name: Upload to Firebase App Distribution uses: wzieba/Firebase-Distribution-Github-Action@v1 with: appId: ${{ secrets.FIREBASE_APP_ID }} - serviceCredentialsFileContent: ${{ secrets.CREDENTIAL_FILE_CONTENT }} - groups: testers - file: app/release/app-release.apk + serviceCredentialsFileContent: ${{ secrets.FIREBASE_APP_DISTRIBUTION }} + groups: tester + releaseNotesFile: android/release_notes.txt + file: android/app/build/outputs/apk/release/app-release.apk diff --git a/.github/workflows/ktlint.yml b/.github/workflows/ktlint.yml index 0dcfbc6..807f659 100644 --- a/.github/workflows/ktlint.yml +++ b/.github/workflows/ktlint.yml @@ -1,4 +1,4 @@ -name: reviewdog_kotlin +name: Kotlin Lint Check on: pull_request: paths: diff --git a/android/app/build.gradle b/android/app/build.gradle index 7029044..5a9596e 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -18,13 +18,6 @@ android { testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } - buildTypes { - release { - minifyEnabled false - proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' - } - } - signingConfigs { release { storeFile file("keystore.jks") @@ -34,6 +27,14 @@ android { } } + buildTypes { + release { + minifyEnabled false + proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' + signingConfig signingConfigs.release + } + } + compileOptions { sourceCompatibility JavaVersion.VERSION_1_8 targetCompatibility JavaVersion.VERSION_1_8 diff --git a/android/release_notes.txt b/android/release_notes.txt new file mode 100644 index 0000000..e69de29