Merge branch 'lollipop'

This commit is contained in:
Mygod
2023-04-08 15:54:33 -04:00
14 changed files with 37 additions and 43 deletions

View File

@@ -33,7 +33,6 @@ android {
put("room.incremental", "true")
put("room.schemaLocation", "$projectDir/schemas")
}
buildConfigField("boolean", "DONATIONS", "true")
}
buildFeatures {
buildConfig = true
@@ -59,35 +58,34 @@ android {
create("google") {
dimension = "freedom"
versionNameSuffix = "-g"
buildConfigField("boolean", "DONATIONS", "false")
}
}
sourceSets.getByName("androidTest").assets.srcDir("$projectDir/schemas")
}
dependencies {
val lifecycleVersion = "2.6.0-rc01"
val roomVersion = "2.5.0"
val lifecycleVersion = "2.6.1"
val roomVersion = "2.5.1"
coreLibraryDesugaring("com.android.tools:desugar_jdk_libs:2.0.2")
coreLibraryDesugaring("com.android.tools:desugar_jdk_libs:2.0.3")
kapt("androidx.room:room-compiler:$roomVersion")
implementation(kotlin("stdlib-jdk8"))
implementation("androidx.browser:browser:1.5.0")
implementation("androidx.core:core-ktx:1.9.0")
implementation("androidx.fragment:fragment-ktx:1.5.5")
implementation("androidx.core:core-ktx:1.10.0")
implementation("androidx.fragment:fragment-ktx:1.5.6")
implementation("androidx.lifecycle:lifecycle-livedata-ktx:$lifecycleVersion")
implementation("androidx.lifecycle:lifecycle-runtime-ktx:$lifecycleVersion")
implementation("androidx.preference:preference:1.2.0")
implementation("androidx.room:room-ktx:$roomVersion")
implementation("androidx.swiperefreshlayout:swiperefreshlayout:1.1.0")
implementation("be.mygod.librootkotlinx:librootkotlinx:1.0.1")
implementation("com.android.billingclient:billing-ktx:5.1.0")
implementation("be.mygod.librootkotlinx:librootkotlinx:1.0.2")
implementation("com.android.billingclient:billing-ktx:5.2.0")
implementation("com.github.tiann:FreeReflection:3.1.0")
implementation("com.google.android.gms:play-services-base:18.2.0") // fix for GoogleApiActivity crash
implementation("com.google.android.gms:play-services-base:18.2.0") // fix for GoogleApiActivity crash @ 18.1.0+
implementation("com.google.android.gms:play-services-oss-licenses:17.0.0")
implementation("com.google.android.material:material:1.8.0")
implementation("com.google.firebase:firebase-analytics-ktx:21.2.0")
implementation("com.google.firebase:firebase-crashlytics:18.3.5")
implementation("com.google.firebase:firebase-analytics-ktx:21.2.1")
implementation("com.google.firebase:firebase-crashlytics:18.3.6")
implementation("com.google.zxing:core:3.5.1")
implementation("com.jakewharton.timber:timber:5.0.1")
implementation("com.linkedin.dexmaker:dexmaker:2.28.3")