From c58e9d13d295cbe5d2fcabaf9c9a2ccfe4ae9cf0 Mon Sep 17 00:00:00 2001 From: Foxpace Date: Wed, 21 Feb 2024 22:11:20 +0100 Subject: [PATCH] Downgrades dependencies for Wear OS SDK 33 --- WearOsLib/build.gradle | 2 +- sensorservices/build.gradle | 2 +- wear/build.gradle | 32 +++++++------------------------- 3 files changed, 9 insertions(+), 27 deletions(-) diff --git a/WearOsLib/build.gradle b/WearOsLib/build.gradle index 9cb8a95..31d87e6 100644 --- a/WearOsLib/build.gradle +++ b/WearOsLib/build.gradle @@ -37,7 +37,7 @@ dependencies { implementation project(path: ':flipper') implementation 'androidx.preference:preference-ktx:1.2.1' - implementation 'androidx.core:core-ktx:1.12.0' + implementation 'androidx.core:core-ktx:1.10.1' implementation 'androidx.appcompat:appcompat:1.6.1' implementation 'androidx.constraintlayout:constraintlayout:2.1.4' diff --git a/sensorservices/build.gradle b/sensorservices/build.gradle index 610f96b..ddfd3c7 100644 --- a/sensorservices/build.gradle +++ b/sensorservices/build.gradle @@ -40,7 +40,7 @@ dependencies { implementation project(path: ':flipper') implementation "androidx.multidex:multidex:2.0.1" - implementation 'androidx.core:core-ktx:1.12.0' + implementation 'androidx.core:core-ktx:1.10.1' implementation 'androidx.appcompat:appcompat:1.6.1' implementation 'com.google.android.gms:play-services-location:21.1.0' implementation 'com.google.android.gms:play-services-maps:18.2.0' diff --git a/wear/build.gradle b/wear/build.gradle index 6ece0cc..6433935 100644 --- a/wear/build.gradle +++ b/wear/build.gradle @@ -2,30 +2,25 @@ apply plugin: 'com.android.application' apply plugin: 'kotlin-android' apply plugin: 'com.google.gms.google-services' apply plugin: 'com.google.android.libraries.mapsplatform.secrets-gradle-plugin' - if (getGradle().getStartParameter().getTaskRequests().toString().contains("Release")) { apply plugin: 'com.google.firebase.crashlytics' } - android { - compileSdk 34 - + compileSdk 33 defaultConfig { applicationId "motionapps.sensorbox" minSdkVersion 25 - targetSdkVersion 34 + targetSdkVersion 33 versionCode 1000048 versionName "3.5.2" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" signingConfig signingConfigs.debug } - buildTypes { release { minifyEnabled false proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' } - nfrelease{ initWith release } @@ -37,49 +32,36 @@ android { kotlinOptions { jvmTarget = JavaVersion.VERSION_17 } - namespace 'com.motionapps.sensorbox' } - dependencies { implementation fileTree(dir: "libs", include: ["*.jar"]) implementation project(path: ':wearoslib') implementation project(path: ':SensorServices') - - implementation 'androidx.core:core-ktx:1.12.0' + implementation 'androidx.core:core-ktx:1.10.1' implementation 'androidx.appcompat:appcompat:1.6.1' implementation 'androidx.wear:wear-remote-interactions:1.0.0' - testImplementation 'junit:junit:4.13.2' androidTestImplementation 'androidx.test.ext:junit:1.1.5' androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1' - implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.3' implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.3' - releaseImplementation 'com.google.firebase:firebase-analytics-ktx:21.5.1' releaseImplementation 'com.google.firebase:firebase-crashlytics-ktx:18.6.2' - implementation 'androidx.percentlayout:percentlayout:1.0.0' - implementation 'androidx.recyclerview:recyclerview:1.3.2' + implementation 'androidx.recyclerview:recyclerview:1.3.1' implementation 'androidx.wear:wear:1.3.0' implementation 'androidx.preference:preference-ktx:1.2.1' implementation 'androidx.legacy:legacy-support-v4:1.0.0' implementation 'androidx.constraintlayout:constraintlayout:2.1.4' - - implementation 'com.google.android.support:wearable:2.9.0' implementation 'com.google.android.gms:play-services-wearable:18.1.0' implementation 'com.google.android.gms:play-services-location:21.1.0' implementation 'com.google.android.gms:play-services-basement:18.3.0' implementation 'com.google.android.gms:play-services-maps:18.2.0' - implementation 'com.google.android.material:material:1.11.0' - - implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.7.0' - + implementation 'com.google.android.material:material:1.9.0' + implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.6.1' implementation 'com.github.GrenderG:Toasty:1.5.2' implementation 'com.jjoe64:graphview:4.2.2' - compileOnly 'com.google.android.wearable:wearable:2.9.0' - -} +} \ No newline at end of file