Skip to content

Commit

Permalink
5.15. Updating to latest and greatest. That's all folks!
Browse files Browse the repository at this point in the history
  • Loading branch information
Kiarasht committed May 16, 2024
1 parent 6bda057 commit 16a5c6f
Show file tree
Hide file tree
Showing 4 changed files with 22 additions and 14 deletions.
21 changes: 12 additions & 9 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -12,14 +12,17 @@ android {
// Removing packaging options otherwise it gives duplicate error

compileOptions {
sourceCompatibility JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_1_8
sourceCompatibility JavaVersion.VERSION_17
targetCompatibility JavaVersion.VERSION_17
}
kotlinOptions {
jvmTarget = '17'
}

compileSdk 34
defaultConfig {
applicationId "com.restart.spacestationtracker"
minSdkVersion 19
minSdkVersion 21
targetSdkVersion 34
versionCode 37
versionName "5.14"
Expand All @@ -44,27 +47,27 @@ dependencies {
implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
implementation 'androidx.recyclerview:recyclerview:1.3.2'
implementation 'androidx.cardview:cardview:1.0.0'
implementation 'com.google.android.material:material:1.10.0'
implementation 'com.google.android.material:material:1.12.0'
implementation "androidx.coordinatorlayout:coordinatorlayout:1.2.0"
implementation 'androidx.work:work-runtime:2.9.0'

implementation platform('com.google.firebase:firebase-bom:28.4.2')
implementation platform('com.google.firebase:firebase-bom:33.0.0')

implementation 'com.google.firebase:firebase-core:21.1.1'
implementation 'com.google.firebase:firebase-ads:22.6.0'
implementation 'com.google.firebase:firebase-ads:23.1.0'
implementation 'com.google.firebase:firebase-crash:16.2.1'
implementation 'com.google.android.gms:play-services-maps:18.2.0'
implementation 'com.google.android.gms:play-services-location:21.0.1'
implementation 'com.google.android.gms:play-services-location:21.2.0'
implementation 'com.google.firebase:firebase-analytics'

implementation 'com.nightonke:boommenu:2.1.1'
implementation 'com.android.volley:volley:1.2.1'
implementation 'com.github.wooplr:Spotlight:1.2.3'
implementation 'androidx.browser:browser:1.7.0'
implementation 'androidx.browser:browser:1.8.0'
implementation 'com.github.bumptech.glide:glide:4.16.0'
implementation 'com.android.support:multidex:1.0.3'
implementation 'com.airbnb.android:lottie:6.1.0'
implementation 'com.google.android.ump:user-messaging-platform:2.1.0'
implementation 'com.google.android.ump:user-messaging-platform:2.2.0'

androidTestImplementation "androidx.test.espresso:espresso-core:3.5.1"
androidTestImplementation 'androidx.test.ext:junit-ktx:1.1.5'
Expand Down
5 changes: 5 additions & 0 deletions app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,11 @@
android:usesCleartextTraffic="true"
tools:replace="android:allowBackup">

<property
android:name="android.adservices.AD_SERVICES_CONFIG"
android:resource="@xml/gma_ad_services_config"
tools:replace="android:resource" />

<!-- Maps Activity (Launcher) -->
<activity
android:name=".MapsActivity"
Expand Down
8 changes: 4 additions & 4 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
// Top-level build file where you can add configuration options common to all sub-projects/modules.
buildscript {
ext.kotlin_version = '1.7.20'
ext.kotlin_version = '1.9.22'

repositories {
//noinspection JcenterRepositoryObsolete
jcenter()
google()
}
dependencies {
classpath 'com.android.tools.build:gradle:8.2.0'
classpath 'com.google.gms:google-services:4.4.0'
classpath 'com.android.tools.build:gradle:8.4.0'
classpath 'com.google.gms:google-services:4.4.1'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
classpath 'com.google.gms:google-services:4.4.0'
classpath 'com.google.gms:google-services:4.4.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.2-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-all.zip

0 comments on commit 16a5c6f

Please sign in to comment.