Skip to content

Commit

Permalink
Remove firebase and updated workflows
Browse files Browse the repository at this point in the history
  • Loading branch information
JackEblan committed Jan 31, 2024
1 parent 68e2ee1 commit 1bc4b70
Show file tree
Hide file tree
Showing 9 changed files with 15 additions and 144 deletions.
10 changes: 5 additions & 5 deletions .github/workflows/Build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -58,14 +58,14 @@ jobs:
if: always()
run: ./gradlew test

- name: Build Github debug APK
run: ./gradlew :app:assembleGithubDebug
- name: Build debug APK
run: ./gradlew assembleDebug

- name: Upload Github debug build output (APK)
- name: Upload debug build output (APK)
uses: actions/upload-artifact@v4
with:
name: APK
path: 'app/build/outputs/apk/github/debug/*.apk'
path: 'app/build/outputs/apk/debug/*.apk'

androidTest:
runs-on: macOS-latest # enables hardware acceleration in the virtual machine
Expand Down Expand Up @@ -94,7 +94,7 @@ jobs:
uses: gradle/gradle-build-action@v2

- name: Build projects before running emulator
run: ./gradlew packageGithubDebug packageGithubDebugAndroidTest
run: ./gradlew packageDebug packageDebugAndroidTest

- name: Run instrumentation tests
uses: reactivecircus/android-emulator-runner@v2
Expand Down
18 changes: 9 additions & 9 deletions .github/workflows/Release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,23 +34,23 @@ jobs:
distribution: 'zulu'
java-version: 17

- name: Build Fdroid release APK
run: ./gradlew assembleFdroidRelease
- name: Build release APK
run: ./gradlew assembleRelease

- name: Sign Fdroid release APK
- name: Sign release APK
uses: r0adkll/sign-android-release@v1
id: sign_fdroid_release_apk
id: sign_release_apk
with:
releaseDirectory: app/build/outputs/apk/fdroid/release
releaseDirectory: app/build/outputs/apk/release
signingKeyBase64: ${{ secrets.SIGNING_KEY_BASE64 }}
alias: ${{ secrets.SIGNING_KEY_ALIAS }}
keyStorePassword: ${{ secrets.SIGNING_KEY_STORE_PASSWORD }}
keyPassword: ${{ secrets.SIGNING_KEY_PASSWORD }}
env:
BUILD_TOOLS_VERSION: "34.0.0"

- name: Rename signed Fdroid apk
run: mv ${{steps.sign_fdroid_release_apk.outputs.signedReleaseFile}} app/build/outputs/apk/fdroid/release/geto-fdroid-${{ github.ref_name }}.apk
- name: Rename signed apk
run: mv ${{steps.sign_release_apk.outputs.signedReleaseFile}} app/build/outputs/apk/release/geto-${{ github.ref_name }}.apk

- name: Create release
id: create_release
Expand All @@ -69,6 +69,6 @@ jobs:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
upload_url: ${{ steps.create_release.outputs.upload_url }}
asset_path: app/build/outputs/apk/fdroid/release/geto-fdroid-${{ github.ref_name }}.apk
asset_name: geto-fdroid-${{ github.ref_name }}.apk
asset_path: app/build/outputs/apk/release/geto-${{ github.ref_name }}.apk
asset_name: geto-${{ github.ref_name }}.apk
asset_content_type: application/vnd.android.package-archive
1 change: 0 additions & 1 deletion app/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
plugins {
alias(libs.plugins.com.android.geto.application)
alias(libs.plugins.com.android.geto.applicationCompose)
alias(libs.plugins.com.android.geto.applicationFlavors)
alias(libs.plugins.com.android.geto.hilt)
}

Expand Down
11 changes: 0 additions & 11 deletions build-logic/convention/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ tasks.withType<KotlinCompile>().configureEach {
}

dependencies {
compileOnly(libs.firebase.crashlytics.gradlePlugin)
compileOnly(libs.android.gradlePlugin)
compileOnly(libs.kotlin.gradlePlugin)
compileOnly(libs.ksp.gradlePlugin)
Expand Down Expand Up @@ -64,16 +63,6 @@ gradlePlugin {
implementationClass = "AndroidFeatureConventionPlugin"
}

register("androidFirebase") {
id = "com.android.geto.applicationFirebase"
implementationClass = "AndroidApplicationFirebaseConventionPlugin"
}

register("androidFlavors") {
id = "com.android.geto.applicationFlavors"
implementationClass = "AndroidApplicationFlavorsConventionPlugin"
}

register("androidHilt") {
id = "com.android.geto.hilt"
implementationClass = "AndroidHiltConventionPlugin"
Expand Down

This file was deleted.

This file was deleted.

This file was deleted.

2 changes: 0 additions & 2 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,4 @@ plugins {
alias(libs.plugins.com.google.dagger.hilt.android) apply false
alias(libs.plugins.com.google.devtools.ksp) apply false
alias(libs.plugins.com.android.library) apply false
alias(libs.plugins.gms) apply false
alias(libs.plugins.firebase.crashlytics) apply false
}
13 changes: 1 addition & 12 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,6 @@ androidxTestExt = "1.1.5"
androidxTestRules = "1.5.0"
androidxTestRunner = "1.5.2"
coil = "2.5.0"
firebaseBom = "32.7.1"
firebaseCrashlyticsPlugin = "2.9.9"
gmsPlugin = "4.4.0"
hilt = "2.48.1"
jacoco = "0.8.7"
kotlinxCoroutines = "1.7.3"
Expand Down Expand Up @@ -57,9 +54,6 @@ androidx-test-rules = { group = "androidx.test", name = "rules", version.ref = "
androidx-test-runner = { group = "androidx.test", name = "runner", version.ref = "androidxTestRunner" }
coil-kt-compose = { group = "io.coil-kt", name = "coil-compose", version.ref = "coil" }
dagger-compiler = { group = "com.google.dagger", name = "dagger-compiler", version.ref = "hilt" }
firebase-bom = { group = "com.google.firebase", name = "firebase-bom", version.ref = "firebaseBom" }
firebase-analytics = { group = "com.google.firebase", name = "firebase-analytics" }
firebase-crashlytics = { group = "com.google.firebase", name = "firebase-crashlytics" }
hilt-android-gradle-plugin = { group = "com.google.dagger", name = "hilt-android-gradle-plugin", version.ref = "hilt" }
hilt-compiler = { group = "com.google.dagger", name = "hilt-compiler", version.ref = "hilt" }
hilt-android-testing = { group = "com.google.dagger", name = "hilt-android-testing", version.ref = "hilt" }
Expand All @@ -77,16 +71,13 @@ room-testing = { group = "androidx.room", name = "room-testing", version.ref = "

# Dependencies of the included build-logic
android-gradlePlugin = { group = "com.android.tools.build", name = "gradle", version.ref = "androidGradlePlugin" }
firebase-crashlytics-gradlePlugin = { group = "com.google.firebase", name = "firebase-crashlytics-gradle", version.ref = "firebaseCrashlyticsPlugin" }
kotlin-gradlePlugin = { group = "org.jetbrains.kotlin", name = "kotlin-gradle-plugin", version.ref = "kotlinGradlePlugin" }
ksp-gradlePlugin = { group = "com.google.devtools.ksp", name = "com.google.devtools.ksp.gradle.plugin", version.ref = "ksp" }

[plugins]
com-android-application = { id = "com.android.application", version.ref = "androidGradlePlugin" }
com-android-library = { id = "com.android.library", version.ref = "androidGradlePlugin" }
org-jetbrains-kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlinGradlePlugin" }
firebase-crashlytics = { id = "com.google.firebase.crashlytics", version.ref = "firebaseCrashlyticsPlugin" }
gms = { id = "com.google.gms.google-services", version.ref = "gmsPlugin" }
com-google-dagger-hilt-android = { id = "com.google.dagger.hilt.android", version.ref = "hilt" }
com-google-devtools-ksp = { id = "com.google.devtools.ksp", version.ref = "ksp" }

Expand All @@ -99,6 +90,4 @@ com-android-geto-libraryCompose = { id = "com.android.geto.libraryCompose", vers
com-android-geto-libraryJacoco = { id = "com.android.geto.libraryJacoco", version = "unspecified" }
com-android-geto-feature = { id = "com.android.geto.feature", version = "unspecified" }
com-android-geto-hilt = { id = "com.android.geto.hilt", version = "unspecified" }
com-android-geto-room = { id = "com.android.geto.room", version = "unspecified" }
com-android-geto-applicationFirebase = { id = "com.android.geto.applicationFirebase", version = "unspecified" }
com-android-geto-applicationFlavors = { id = "com.android.geto.applicationFlavors", version = "unspecified" }
com-android-geto-room = { id = "com.android.geto.room", version = "unspecified" }

0 comments on commit 1bc4b70

Please sign in to comment.