Move to SDK 31; upgrade libs

This commit is contained in:
Philipp Heckel 2022-01-21 14:15:53 -05:00
parent 0e2899c419
commit 80781821a8
2 changed files with 19 additions and 30 deletions

View file

@ -5,12 +5,12 @@ apply plugin: 'kotlin-kapt'
apply plugin: 'com.google.gms.google-services' apply plugin: 'com.google.gms.google-services'
android { android {
compileSdkVersion 30 compileSdkVersion 31
defaultConfig { defaultConfig {
applicationId "io.heckel.ntfy" applicationId "io.heckel.ntfy"
minSdkVersion 21 minSdkVersion 21
targetSdkVersion 30 targetSdkVersion 31
versionCode 18 versionCode 18
versionName "1.7.1" versionName "1.7.1"
@ -60,22 +60,22 @@ android {
} }
dependencies { dependencies {
implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" // AndroidX, The Basics
implementation "androidx.appcompat:appcompat:$rootProject.appCompatVersion" implementation "androidx.appcompat:appcompat:1.4.1"
implementation "androidx.core:core-ktx:$rootProject.coreKtxVersion" implementation "androidx.core:core-ktx:1.7.0"
implementation "androidx.constraintlayout:constraintlayout:$rootProject.constraintLayoutVersion" implementation "androidx.constraintlayout:constraintlayout:2.1.3"
implementation "androidx.activity:activity-ktx:$rootProject.activityVersion" implementation "androidx.activity:activity-ktx:1.4.0"
implementation "androidx.fragment:fragment-ktx:$rootProject.fragmentVersion" implementation "androidx.fragment:fragment-ktx:1.4.0"
implementation 'com.google.code.gson:gson:2.8.9' implementation "androidx.work:work-runtime-ktx:2.7.1"
// WorkManager
implementation "androidx.work:work-runtime-ktx:2.6.0"
implementation 'androidx.preference:preference-ktx:1.1.1' implementation 'androidx.preference:preference-ktx:1.1.1'
// JSON serialization
implementation 'com.google.code.gson:gson:2.8.9'
// Room (SQLite) // Room (SQLite)
def roomVersion = "2.3.0" def room_version = "2.4.1"
implementation "androidx.room:room-ktx:$roomVersion" implementation "androidx.room:room-ktx:$room_version"
kapt "androidx.room:room-compiler:$roomVersion" kapt "androidx.room:room-compiler:$room_version"
// OkHttp (HTTP library) // OkHttp (HTTP library)
implementation 'com.squareup.okhttp3:okhttp:4.9.3' implementation 'com.squareup.okhttp3:okhttp:4.9.3'
@ -84,16 +84,16 @@ dependencies {
playImplementation 'com.google.firebase:firebase-messaging:23.0.0' playImplementation 'com.google.firebase:firebase-messaging:23.0.0'
// RecyclerView // RecyclerView
implementation "androidx.recyclerview:recyclerview:$rootProject.recyclerViewVersion" implementation "androidx.recyclerview:recyclerview:1.3.0-alpha01"
// Swipe down to refresh // Swipe down to refresh
implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.1.0' implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.1.0'
// Material design // Material design
implementation "com.google.android.material:material:$rootProject.materialVersion" implementation "com.google.android.material:material:1.5.0"
// LiveData // LiveData
implementation "androidx.lifecycle:lifecycle-livedata-ktx:$rootProject.liveDataVersion" implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.4.0"
implementation 'androidx.legacy:legacy-support-v4:1.0.0' implementation 'androidx.legacy:legacy-support-v4:1.0.0'
// Image viewer // Image viewer

View file

@ -1,5 +1,5 @@
buildscript { buildscript {
ext.kotlin_version = '1.4.10' ext.kotlin_version = '1.6.10'
repositories { repositories {
google() google()
jcenter() jcenter()
@ -25,14 +25,3 @@ allprojects {
task clean(type: Delete) { task clean(type: Delete) {
delete rootProject.buildDir delete rootProject.buildDir
} }
ext {
materialVersion = '1.2.1'
liveDataVersion = '2.2.0'
recyclerViewVersion = '1.2.0-alpha06'
appCompatVersion = '1.2.0'
coreKtxVersion = '1.3.2'
constraintLayoutVersion = '2.0.4'
activityVersion = '1.1.0'
fragmentVersion = '1.1.0'
}