Skip to content

Commit

Permalink
Update dependencies to fix lifecycle inheritance (#689)
Browse files Browse the repository at this point in the history
* Update dependencies to fix lifecycle inheritance

* Update Gradle via wrapper

* Update AGP via wizard

* Fix remaining errors
  • Loading branch information
apramana authored Sep 7, 2023
1 parent ed000fd commit 87d7450
Show file tree
Hide file tree
Showing 57 changed files with 284 additions and 305 deletions.
12 changes: 12 additions & 0 deletions .github/workflows/build_test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,21 @@ jobs:
steps:
- name: Checkout mavericks
uses: actions/checkout@v2
- uses: actions/setup-java@v3
with:
distribution: 'temurin'
java-version: '17'
- name: Detekt
run: "./gradlew detekt -PCI=true"
lint:
runs-on: ubuntu-latest
steps:
- name: Checkout mavericks
uses: actions/checkout@v2
- uses: actions/setup-java@v3
with:
distribution: 'temurin'
java-version: '17'
- name: Lint
run: "./gradlew lintRelease"
test-coverage:
Expand All @@ -26,6 +34,10 @@ jobs:
steps:
- name: Checkout mavericks
uses: actions/checkout@v2
- uses: actions/setup-java@v3
with:
distribution: 'temurin'
java-version: '17'
- name: Unit Tests
run: "./gradlew testReleaseUnitTest"
- name: Code Coverage
Expand Down
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ subprojects { project ->

if (project.hasProperty("android")) {
android {
compileSdkVersion 32
compileSdkVersion 33

defaultConfig {
// Allow projects to override this.
Expand Down
3 changes: 3 additions & 0 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -22,3 +22,6 @@ android.useAndroidX=true
# With the default memory size Gradle gets out of memory issues when building, so we have to increase it
# Dokka fails without a larger metaspace https://github.com/Kotlin/dokka/issues/1405
org.gradle.jvmargs=-Xms128m -Xmx4096m -XX:MaxMetaspaceSize=2g
android.defaults.buildfeatures.buildconfig=true
android.nonTransitiveRClass=false
android.nonFinalResIds=false
5 changes: 3 additions & 2 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
# 5. Make sure it is using the version you want

[plugins]
ksp = { id = "com.google.devtools.ksp", version = "1.7.10-1.0.6" }
ksp = { id = "com.google.devtools.ksp", version = "1.8.22-1.0.11" }

[libraries]
androidGradle = "com.android.tools.build:gradle:_"
Expand Down Expand Up @@ -43,10 +43,11 @@ fragmentKtx = "androidx.fragment:fragment-ktx:_"
fragmentTesting = "androidx.fragment:fragment-testing:_"
koin = "io.insert-koin:koin-android:_"
kotlinGradle = "org.jetbrains.kotlin:kotlin-gradle-plugin:_"
kotlin = "org.jetbrains.kotlin:kotlin-stdlib-jdk8:_"
kotlin = "org.jetbrains.kotlin:kotlin-stdlib:_"
kotlinCoroutines = "org.jetbrains.kotlinx:kotlinx-coroutines-core:_"
kotlinReflect = "org.jetbrains.kotlin:kotlin-reflect:_"
lifecycleCommon = "androidx.lifecycle:lifecycle-common-java8:_"
lifecycleTest = "androidx.lifecycle:lifecycle-runtime-testing:_"
lottie = "com.airbnb.android:lottie:_"
moshi = "com.squareup.moshi:moshi:_"
moshiCodegen = "com.squareup.moshi:moshi-kotlin-codegen:_"
Expand Down
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
3 changes: 2 additions & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.1-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-bin.zip
networkTimeout=10000
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
Loading

0 comments on commit 87d7450

Please sign in to comment.