From abc99bbf4d5dd14f20d57594cac7621be2f91cd6 Mon Sep 17 00:00:00 2001 From: Maik Riechel Date: Tue, 24 Aug 2021 09:34:41 +0200 Subject: [PATCH] BAHNHOFLIVE-2014 Upgrade to SDK30, update dependencies --- build.gradle | 4 ++-- modules/app-community/build.gradle | 4 ++-- modules/core/build.gradle | 20 ++++++++++---------- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/build.gradle b/build.gradle index 2ad70e67..287df6cc 100644 --- a/build.gradle +++ b/build.gradle @@ -1,14 +1,14 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. buildscript { - ext.kotlin_version = '1.5.0' + ext.kotlin_version = '1.5.21' repositories { jcenter() google() } dependencies { classpath 'com.android.tools.build:gradle:7.0.1' - classpath 'com.google.gms:google-services:4.3.5' + classpath 'com.google.gms:google-services:4.3.10' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" // NOTE: Do not place your application dependencies here; they belong diff --git a/modules/app-community/build.gradle b/modules/app-community/build.gradle index b289f054..f39a82fe 100644 --- a/modules/app-community/build.gradle +++ b/modules/app-community/build.gradle @@ -6,10 +6,10 @@ apply plugin: 'kotlin-kapt' group 'de.deutschebahn.bahnhoflive' android { - compileSdkVersion 29 + compileSdkVersion 30 defaultConfig { minSdkVersion 19 - targetSdkVersion 29 + targetSdkVersion 30 versionCode 84 versionName "3.6.1" applicationId "de.deutschebahn.bahnhoflive.community" diff --git a/modules/core/build.gradle b/modules/core/build.gradle index d6ac58be..436a0e11 100644 --- a/modules/core/build.gradle +++ b/modules/core/build.gradle @@ -6,10 +6,10 @@ apply plugin: 'kotlin-kapt' group 'de.deutschebahn.bahnhoflive' android { - compileSdkVersion 29 + compileSdkVersion 30 defaultConfig { minSdkVersion 19 - targetSdkVersion 29 + targetSdkVersion 30 multiDexEnabled true buildConfigField "String", "BUSINESS_HUB_API_KEY", "\"TOL1jxXeqIW72s7vKPCcUuPNqFJTvPQx\"" // open source community API key @@ -46,20 +46,20 @@ android { dependencies { api "androidx.legacy:legacy-support-v4:1.0.0" - api "androidx.appcompat:appcompat:1.2.0" - implementation "com.google.android.material:material:1.3.0" + api "androidx.appcompat:appcompat:1.3.1" + implementation "com.google.android.material:material:1.4.0" implementation "androidx.vectordrawable:vectordrawable-animated:1.1.0" implementation "androidx.viewpager2:viewpager2:1.0.0" - implementation 'androidx.media:media:1.3.0' - implementation "androidx.recyclerview:recyclerview:1.2.0" + implementation 'androidx.media:media:1.4.1' + implementation "androidx.recyclerview:recyclerview:1.2.1" implementation "androidx.cardview:cardview:1.0.0" - implementation 'androidx.constraintlayout:constraintlayout:2.0.4' - implementation 'androidx.activity:activity-ktx:1.2.2' - implementation 'androidx.fragment:fragment-ktx:1.3.3' + implementation 'androidx.constraintlayout:constraintlayout:2.1.0' + implementation 'androidx.activity:activity-ktx:1.3.1' + implementation 'androidx.fragment:fragment-ktx:1.3.6' api 'androidx.multidex:multidex:2.0.1' api 'com.android.volley:volley:1.2.0' api 'com.google.android.gms:play-services-maps:17.0.1' - implementation 'com.google.firebase:firebase-messaging:21.1.0' + implementation 'com.google.firebase:firebase-messaging:22.0.0' api 'com.google.code.gson:gson:2.8.6' implementation 'com.google.android:flexbox:1.1.0' implementation 'com.jakewharton:disklrucache:2.0.2'