diff --git a/app/build.gradle b/app/build.gradle --- a/app/build.gradle +++ b/app/build.gradle @@ -4,14 +4,14 @@ android { - compileSdkVersion 33 - buildToolsVersion '33.0.2' + compileSdk 34 namespace "it.reyboz.bustorino" defaultConfig { applicationId "it.reyboz.bustorino" minSdkVersion 21 - targetSdkVersion 33 + targetSdkVersion 34 + buildToolsVersion = '34.0.0' versionCode 54 versionName "2.1.4" vectorDrawables.useSupportLibrary = true @@ -43,9 +43,6 @@ } } - lintOptions { - abortOnError false - } repositories { mavenCentral() @@ -62,6 +59,9 @@ kotlin { jvmToolchain 17 } + lint { + abortOnError false + } } dependencies { @@ -88,7 +88,7 @@ implementation "androidx.coordinatorlayout:coordinatorlayout:1.2.0" - implementation 'org.jsoup:jsoup:1.13.1' + implementation 'org.jsoup:jsoup:1.15.3' implementation 'com.readystatesoftware.sqliteasset:sqliteassethelper:2.0.1' implementation 'com.android.volley:volley:1.2.1' @@ -99,7 +99,7 @@ implementation "ch.acra:acra-mail:$acra_version" implementation "ch.acra:acra-dialog:$acra_version" // google transit realtime - implementation 'com.google.protobuf:protobuf-java:3.17.2' + implementation 'com.google.protobuf:protobuf-java:3.19.6' // mqtt library implementation 'org.eclipse.paho:org.eclipse.paho.client.mqttv3:1.2.5' implementation 'com.github.hannesa2:paho.mqtt.android:4.1' diff --git a/build.gradle b/build.gradle --- a/build.gradle +++ b/build.gradle @@ -9,10 +9,13 @@ } + //kotlin + ext.kotlin_version = '1.9.0' + ext.coroutines_version = "1.7.3" dependencies { - classpath 'com.android.tools.build:gradle:7.4.2' - classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.8.22" + classpath 'com.android.tools.build:gradle:8.1.4' + classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" } } @@ -32,9 +35,6 @@ lifecycle_version = "2.4.1" arch_version = "2.1.0" room_version = "2.5.2" - //kotlin - kotlin_version = '1.8.0' - coroutines_version = "1.7.0" } diff --git a/gradle.properties b/gradle.properties --- a/gradle.properties +++ b/gradle.properties @@ -1 +1,4 @@ +android.defaults.buildfeatures.buildconfig=true +android.nonFinalResIds=false +android.nonTransitiveRClass=false android.useAndroidX=true \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ #Sat Apr 24 16:03:07 CEST 2021 distributionBase=GRADLE_USER_HOME -distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.1-bin.zip distributionPath=wrapper/dists zipStorePath=wrapper/dists zipStoreBase=GRADLE_USER_HOME