Skip to content

Commit

Permalink
Migrate to version catalog. make crashlitycs shit works.
Browse files Browse the repository at this point in the history
  • Loading branch information
sirelon committed Nov 22, 2023
1 parent ec0e55a commit 4894590
Show file tree
Hide file tree
Showing 4 changed files with 16 additions and 17 deletions.
20 changes: 10 additions & 10 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@ plugins {
alias(libs.plugins.android.application)
alias(libs.plugins.kotlin.android)
alias(libs.plugins.kotlin.serialization)
alias(libs.plugins.google.services)
alias(libs.plugins.firebase.perf)
alias(libs.plugins.ksp)
id 'kotlin-parcelize'
// id 'com.google.firebase.crashlytics'
alias(libs.plugins.google.services)
alias(libs.plugins.firebase.perf)
alias(libs.plugins.firebase.crashlytics)
}

// Create a variable called keystorePropertiesFile, and initialize it to your
Expand Down Expand Up @@ -44,7 +44,7 @@ android {
release {
postprocessing {
removeUnusedCode true
removeUnusedResources true
// removeUnusedResources true // causes The Crashlytics build ID is missing for some reason
obfuscate true
optimizeCode true
proguardFile 'proguard-rules.pro'
Expand Down Expand Up @@ -87,15 +87,14 @@ dependencies {
implementation(libs.ksp)
implementation(libs.androidx.compose)

// implementation "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version"

debugImplementation(libs.compose.ui.tooling)
implementation(libs.compose.ui)
implementation(libs.compose.ui.util)
implementation(libs.compose.foundation)
implementation(libs.compose.material)
implementation(libs.compose.material.icons.core)
implementation(libs.compose.material.icons.extended)
implementation(libs.compose.ui.tooling)

implementation(libs.accompanist.placeholder)
implementation(libs.accompanist.flowlayout)
Expand Down Expand Up @@ -136,15 +135,16 @@ dependencies {
implementation libs.kotlinx.serialization.json

// https://firebase.google.com/support/release-notes/android
implementation platform('com.google.firebase:firebase-bom:32.5.0')
implementation platform('com.google.firebase:firebase-bom:32.6.0')

implementation 'com.google.firebase:firebase-analytics'
// implementation 'com.google.firebase:firebase-crashlytics'
implementation 'com.google.firebase:firebase-crashlytics'
implementation 'com.google.firebase:firebase-perf'
implementation 'com.google.firebase:firebase-firestore'
implementation 'com.google.firebase:firebase-messaging'
implementation 'com.google.android.gms:play-services-ads:22.5.0'
implementation 'com.google.android.ump:user-messaging-platform:2.1.0'

implementation libs.play.services.ads
implementation libs.user.messaging.platform

implementation libs.timber

Expand Down
1 change: 0 additions & 1 deletion app/src/main/res/values/strings.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
<resources>
<string name="app_name">Mars Rover Photos</string>

<string name="title_activity_image">ImageActivity</string>
<string name="dummy_button">Dummy Button</string>
<string name="dummy_content">DUMMY\nCONTENT</string>
Expand Down
7 changes: 1 addition & 6 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,16 +1,11 @@
// Top-level build file where you can add configuration options common to all sub-projects/modules.

buildscript {
ext.kotlin_version = '1.9.20'
}

plugins {
alias(libs.plugins.android.application) apply false
alias(libs.plugins.kotlin.jvm) apply false
alias(libs.plugins.kotlin.android) apply false
alias(libs.plugins.google.services) apply false
alias(libs.plugins.firebase.perf) apply false
// id 'com.google.firebase.crashlytics' version '2.9.9' apply false
alias(libs.plugins.firebase.crashlytics) apply false
}

allprojects {
Expand Down
5 changes: 5 additions & 0 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,11 @@ mockito = "1.6.0"
# https://developer.android.com/jetpack/androidx/releases/paging
paging = "3.3.0-alpha02"
# https://developer.android.com/jetpack/androidx/releases/room
playServicesAds = "22.5.0"
room = "2.6.0"
# https://developer.android.com/jetpack/androidx/releases/work
timber = "5.0.1"
userMessagingPlatform = "2.1.0"
work = "2.8.1"
# https://github.com/usuiat/Zoomable/releases
zoomable = "1.5.1"
Expand Down Expand Up @@ -83,6 +85,8 @@ accompanist-placeholder = { group = "com.google.accompanist", name = "accompanis
accompanist-flowlayout = { group = "com.google.accompanist", name = "accompanist-flowlayout", version.ref = "accompanist" }
accompanist-systemuicontroller = { group = "com.google.accompanist", name = "accompanist-systemuicontroller", version.ref = "accompanist" }

play-services-ads = { module = "com.google.android.gms:play-services-ads", version.ref = "playServicesAds" }
user-messaging-platform = { module = "com.google.android.ump:user-messaging-platform", version.ref = "userMessagingPlatform" }
timber = { module = "com.jakewharton.timber:timber", version.ref = "timber" }
zoomable = { module = "net.engawapg.lib:zoomable", version.ref = "zoomable" }

Expand All @@ -94,5 +98,6 @@ kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
kotlin-parcelize = { id = "org.jetbrains.kotlin.parcelize", version.ref = "kotlin" }
kotlin-serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin" }
firebase-perf = { id = "com.google.firebase.firebase-perf", version = "1.4.2" }
firebase-crashlytics = { id = "com.google.firebase.crashlytics", version = "2.9.9" }
google-services = { id = "com.google.gms.google-services", version = "4.4.0" }
ksp = { id = "com.google.devtools.ksp", version.ref = "ksp" }

0 comments on commit 4894590

Please sign in to comment.