Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update dependencies #230

Merged
merged 15 commits into from
Aug 25, 2024
Merged
26 changes: 1 addition & 25 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ on:
env:
JDK_JAVA_DISTRIBUTION: 'temurin'
JDK_JAVA_VERSION: '17'
AVD_API_LEVEL: 30

jobs:
static-analysis:
Expand Down Expand Up @@ -78,34 +77,11 @@ jobs:
- name: Set up Gradle
uses: gradle/actions/setup-gradle@v4

- name: Cache AVD
uses: actions/cache@v4
id: avd-cache
with:
path: |
~/.android/avd/*
~/.android/adb*
key: avd-${{ env.AVD_API_LEVEL }}

- name: Create AVD & Generate Snapshot
if: steps.avd-cache.outputs.cache-hit != 'true'
uses: reactivecircus/android-emulator-runner@v2
with:
api-level: ${{ env.AVD_API_LEVEL }}
target: google_apis # https://github.com/ReactiveCircus/android-emulator-runner/issues/106
force-avd-creation: false
emulator-options: -no-window -gpu swiftshader_indirect -noaudio -no-boot-anim -camera-back none
disable-animations: false
script: echo "Generated AVD snapshot."

- name: Run Instrumentation Tests
uses: reactivecircus/android-emulator-runner@v2
with:
api-level: ${{ env.AVD_API_LEVEL }}
api-level: 30
target: google_apis # https://github.com/ReactiveCircus/android-emulator-runner/issues/106
force-avd-creation: false
emulator-options: -no-snapshot-save -no-window -gpu swiftshader_indirect -noaudio -no-boot-anim -camera-back none
disable-animations: true
script: ./gradlew connectedAndroidTest

assemble:
Expand Down
6 changes: 5 additions & 1 deletion app/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -51,8 +51,12 @@ dependencies {
val installGitHook by tasks.registering(Copy::class) {
from(File(rootProject.rootDir, "hooks/pre-push"))
into(File(rootProject.rootDir, ".git/hooks/"))

// https://github.com/gradle/kotlin-dsl-samples/issues/1412
fileMode = 0b111101101 // -rwxr-xr-x
@Suppress("UnstableApiUsage")
filePermissions {
unix("rwxr-xr-x")
}
}

tasks.getByPath(":app:preBuild").dependsOn(installGitHook)
Original file line number Diff line number Diff line change
Expand Up @@ -71,10 +71,8 @@ class GamedgeAndroidPlugin : Plugin<Project> {
}

getByName(BUILD_TYPE_RELEASE) {
debuggable(true)
manifestPlaceholders["usesCleartextTraffic"] = false

isMinifyEnabled = true
proguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro")
}
}
Expand Down Expand Up @@ -133,6 +131,7 @@ class GamedgeAndroidPlugin : Plugin<Project> {

buildTypes {
getByName(BUILD_TYPE_RELEASE) {
isMinifyEnabled = true
signingConfig = signingConfigs.getByName(SIGNING_CONFIG_RELEASE)
}
}
Expand Down
6 changes: 3 additions & 3 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,13 @@ appVersionCode = "1"
appVersionName = "1.0.0"
jvmToolchain = "17"

kotlin = "2.0.10"
kotlin = "2.0.20"
daggerHilt = "2.52"

# Plugins
androidPlugin = "8.3.1"
androidPlugin = "8.5.2"
protobufPlugin = "0.9.4"
kspPlugin = "2.0.10-1.0.24"
kspPlugin = "2.0.20-1.0.24"
gradleVersionsPlugin = "0.51.0"
detektPlugin = "1.23.6"
ktlintPlugin = "12.1.1"
Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-all.zip