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.

Sign up for GitHub

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

Jump to bottom

Fixed overly aggressive R8 issue #142

Merged
merged 2 commits into from
Dec 1, 2023
Merged

Fixed overly aggressive R8 issue #142

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dfc38a2
Fixed overly aggressive R8 issue
timusus Nov 30, 2023
4d131cf
Merge branch 'main' into fix/retrofit-r8
timusus Dec 1, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .idea/deploymentTargetDropDown.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion android/core/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ dependencies {
implementation 'com.squareup.okhttp3:okhttp:4.12.0'

// Retrofit
implementation 'com.squareup.retrofit2:converter-moshi:2.9.0'
implementation 'com.squareup.retrofit2:converter-moshi:2.10.0-SNAPSHOT'

// Moshi
implementation 'com.squareup.moshi:moshi:1.15.0'
Expand Down
4 changes: 2 additions & 2 deletions android/networking/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,8 @@ dependencies {
ksp("com.squareup.moshi:moshi-kotlin-codegen:1.15.0")

// Retrofit
api 'com.squareup.retrofit2:retrofit:2.9.0'
api 'com.squareup.retrofit2:converter-moshi:2.9.0'
api 'com.squareup.retrofit2:retrofit:2.10.0-SNAPSHOT'
api 'com.squareup.retrofit2:converter-moshi:2.10.0-SNAPSHOT'

// Timber
implementation 'com.jakewharton.timber:timber:4.7.1'
Expand Down
2 changes: 1 addition & 1 deletion android/trial/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ dependencies {
implementation 'com.squareup.okhttp3:okhttp:4.12.0'

// Retrofit
implementation 'com.squareup.retrofit2:converter-moshi:2.9.0'
implementation 'com.squareup.retrofit2:converter-moshi:2.10.0-SNAPSHOT'

// Billing
implementation 'com.android.billingclient:billing-ktx:6.1.0'
Expand Down
3 changes: 2 additions & 1 deletion build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ buildscript {
mavenCentral()
}
dependencies {
classpath("com.android.tools.build:gradle:8.1.4")
classpath("com.android.tools.build:gradle:8.2.0")
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.20")
classpath("androidx.navigation:navigation-safe-args-gradle-plugin:2.7.5")
classpath("com.google.gms:google-services:4.4.0")
Expand All @@ -25,5 +25,6 @@ allprojects {
maven("https://jitpack.io")
maven("https://plugins.gradle.org/m2/")
maven("https://maven.pkg.jetbrains.space/public/p/compose/dev")
maven("https://oss.sonatype.org/content/repositories/snapshots")
}
}
3 changes: 3 additions & 0 deletions gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,3 +39,6 @@ kotlin.code.style=official
# https://developer.android.com/build/releases/gradle-plugin#default-changes
android.defaults.buildfeatures.resvalues=false
android.defaults.buildfeatures.shaders=false

# Disable R8 full mode for now, as it's causing crashes in Retrofit Adapters
android.enableR8.fullMode=false