diff --git a/app/build.gradle b/app/build.gradle index 5abdd8e..5c19af7 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -1,188 +1,186 @@ plugins { id 'com.google.protobuf' - id 'org.jetbrains.kotlin.android' id 'com.android.application' id 'com.google.devtools.ksp' } android { compileSdk 36 namespace "it.reyboz.bustorino" defaultConfig { applicationId "it.reyboz.bustorino" minSdkVersion 24 //noinspection EditedTargetSdkVersion targetSdkVersion 36 buildToolsVersion = '36.0.0' versionCode 77 versionName "2.6.5" vectorDrawables.useSupportLibrary = true multiDexEnabled true javaCompileOptions { annotationProcessorOptions { arguments = ["room.schemaLocation": "$projectDir/assets/schemas/".toString()] } } testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } testOptions { unitTests.returnDefaultValues = true } sourceSets { androidTest.assets.srcDirs += files("$projectDir/assets/schemas/".toString()) } buildTypes { debug { applicationIdSuffix ".debug" versionNameSuffix "-dev" } gitpull{ applicationIdSuffix ".gitdev" versionNameSuffix "-gitdev" } } repositories { mavenCentral() mavenLocal() } dependencies { //new libraries } compileOptions { coreLibraryDesugaringEnabled true } kotlin { jvmToolchain 21 } lint { abortOnError false } androidResources { generateLocaleConfig true } buildFeatures{ buildConfig = true } splits{ abi{ enable true reset() // Specifies a list of ABIs for Gradle to create APKs for. include "x86", "x86_64","armeabi-v7a", "arm64-v8a" universalApk true } } packagingOptions { resources.excludes.add("META-INF/*") } } protobuf { protoc { artifact = 'com.google.protobuf:protoc:3.22.3' } generateProtoTasks { all().each { task -> task.builtins { java { option 'lite' } } } } } ksp { arg("room.schemaLocation", "$projectDir/assets/schemas") } dependencies { coreLibraryDesugaring "com.android.tools:desugar_jdk_libs:2.1.5" - implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" api "org.jetbrains.kotlinx:kotlinx-coroutines-core:$coroutines_version" api "org.jetbrains.kotlinx:kotlinx-coroutines-android:$coroutines_version" implementation 'androidx.legacy:legacy-support-v4:1.0.0' // Guava implementation for DBUpdateWorker implementation 'com.google.guava:guava:33.5.0-android' implementation 'com.google.android.flexbox:flexbox:3.0.0' implementation "androidx.fragment:fragment-ktx:$fragment_version" implementation "androidx.activity:activity-ktx:$activity_version" - implementation "androidx.annotation:annotation:1.9.1" - implementation "androidx.swiperefreshlayout:swiperefreshlayout:1.1.0" + implementation "androidx.annotation:annotation:1.11.0" + implementation "androidx.swiperefreshlayout:swiperefreshlayout:1.2.0" implementation "androidx.appcompat:appcompat:$appcompat_version" implementation "androidx.appcompat:appcompat-resources:$appcompat_version" implementation "androidx.preference:preference-ktx:$preference_version" implementation "androidx.work:work-runtime:$work_version" implementation "androidx.work:work-runtime-ktx:$work_version" - implementation "com.google.android.material:material:1.13.0" - implementation 'androidx.constraintlayout:constraintlayout:2.2.1' + implementation "com.google.android.material:material:1.14.0" + implementation 'androidx.constraintlayout:constraintlayout:2.2.2' implementation "androidx.coordinatorlayout:coordinatorlayout:1.3.0" - implementation 'org.jsoup:jsoup:1.22.1' + implementation 'org.jsoup:jsoup:1.23.2' implementation 'com.readystatesoftware.sqliteasset:sqliteassethelper:2.0.1' implementation 'com.android.volley:volley:1.2.1' //maplibre implementation 'org.maplibre.gl:android-sdk:12.0.1' implementation 'org.maplibre.gl:android-sdk-turf:6.0.1' implementation 'org.maplibre.gl:android-plugin-annotation-v9:3.0.2' // remember to enable maven repo jitpack.io when wanting to use osmbonuspack //implementation 'com.github.MKergall:osmbonuspack:6.9.0' // ACRA implementation "ch.acra:acra-mail:$acra_version" implementation "ch.acra:acra-dialog:$acra_version" // google transit realtime - implementation 'com.google.protobuf:protoc:4.34.1' - implementation 'com.google.protobuf:protobuf-javalite:4.34.1' + implementation 'com.google.protobuf:protoc:4.36.2' + implementation 'com.google.protobuf:protobuf-javalite:4.36.2' // mqtt library //implementation 'org.eclipse.paho:org.eclipse.paho.client.mqttv3:1.2.5' //implementation 'com.github.hannesa2:paho.mqtt.android:4.4' - implementation("com.hivemq:hivemq-mqtt-client:1.3.13") - implementation(platform("com.hivemq:hivemq-mqtt-client-websocket:1.3.13")) + implementation("com.hivemq:hivemq-mqtt-client:1.4.0") + implementation(platform("com.hivemq:hivemq-mqtt-client-websocket:1.4.0")) // ViewModel implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:$lifecycle_version" // LiveData implementation "androidx.lifecycle:lifecycle-livedata-ktx:$lifecycle_version" // Lifecycles only (without ViewModel or LiveData) implementation "androidx.lifecycle:lifecycle-runtime-ktx:$lifecycle_version" // Legacy implementation 'androidx.legacy:legacy-support-v4:1.0.0' // Room components implementation "androidx.room:room-runtime:$room_version" implementation "androidx.room:room-ktx:$room_version" ksp "androidx.room:room-compiler:$room_version" //multidex - we need this to build the app implementation "androidx.multidex:multidex:$multidex_version" implementation 'de.siegmar:fastcsv:4.2.0' testImplementation 'junit:junit:4.13.2' androidTestImplementation "androidx.test.ext:junit:1.3.0" androidTestImplementation "androidx.test:core:$androidXTestVersion" androidTestImplementation "androidx.test:runner:$androidXTestVersion" androidTestImplementation "androidx.test:rules:$androidXTestVersion" androidTestImplementation "androidx.room:room-testing:$room_version" } diff --git a/build.gradle b/build.gradle index 431791c..0f1849e 100644 --- a/build.gradle +++ b/build.gradle @@ -1,51 +1,50 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. buildscript { repositories { mavenCentral() maven { url 'https://maven.google.com' } google() maven { url 'https://jitpack.io' } - + gradlePluginPortal() } //kotlin ext.kotlin_version = '2.2.20' ext.coroutines_version = "1.10.2" dependencies { - classpath 'com.google.protobuf:protobuf-gradle-plugin:0.9.5' // or latest - classpath 'com.android.tools.build:gradle:8.13.2' - classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" - classpath "com.google.devtools.ksp:com.google.devtools.ksp.gradle.plugin:$kotlin_version-2.0.4" + classpath 'com.google.protobuf:protobuf-gradle-plugin:0.10.0' // or latest + classpath 'com.android.tools.build:gradle:9.1.0' + classpath "com.google.devtools.ksp:com.google.devtools.ksp.gradle.plugin:2.3.4" } } ext { androidXTestVersion = "1.7.0" //multidex multidex_version = "2.0.1" //libraries versions - fragment_version = "1.8.9" + fragment_version = "1.9.1" activity_version = "1.13.0" - appcompat_version = "1.7.1" + appcompat_version = "1.8.0" preference_version = "1.2.1" - work_version = "2.11.2" + work_version = "2.12.0" acra_version = "5.13.1" - lifecycle_version = "2.10.0" + lifecycle_version = "2.11.0" arch_version = "2.1.0" - room_version = "2.8.4" + room_version = "2.8.5" } allprojects { repositories { maven { url 'https://maven.google.com' } google() mavenCentral() maven { url "https://jitpack.io" } } } diff --git a/gradle.properties b/gradle.properties index f12939a..36e57e5 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,4 +1,5 @@ +android.enableAppCompileTimeRClass=false android.nonFinalResIds=false android.nonTransitiveRClass=false android.useAndroidX=true org.gradle.jvmargs=-Xms200M -Xmx1G diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 37f853b..37f78a6 100755 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,7 +1,7 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-9.3.1-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists