From 5b9223721af023a8240c7f7deb3506c779df2e5c Mon Sep 17 00:00:00 2001 From: antonio Date: Thu, 6 Apr 2023 16:19:44 +0200 Subject: [PATCH] Revert "Dependencies and gradle update" This reverts commit a43b280f1b7c5120572ca82d02425d92db7e9102. --- app/build.gradle | 28 ++++++++----------- .../play/database/AppDatabase.java | 6 ++-- gradle/wrapper/gradle-wrapper.properties | 6 ++-- 3 files changed, 18 insertions(+), 22 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 05b7a6df..cdeb734f 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -3,21 +3,21 @@ apply plugin: 'kotlin-android' apply plugin: 'kotlin-parcelize' android { - compileSdkVersion 'android-UpsideDownCake' + compileSdkVersion 33 buildToolsVersion '33.0.0' defaultConfig { - applicationId 'com.cappielloantonio.playforsubsonic' + applicationId "com.cappielloantonio.playforsubsonic" minSdkVersion 24 targetSdkVersion 33 versionCode 4 - versionName '3.1.0' + versionName "3.1.0" - testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner' + testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" javaCompileOptions { annotationProcessorOptions { - arguments += ['room.schemaLocation': '$projectDir/schemas'.toString()] + arguments += ["room.schemaLocation": "$projectDir/schemas".toString()] } } } @@ -30,12 +30,8 @@ android { } compileOptions { - sourceCompatibility JavaVersion.VERSION_1_8 - targetCompatibility JavaVersion.VERSION_1_8 - } - - kotlinOptions { - jvmTarget = '1.8' + sourceCompatibility 1.8 + targetCompatibility 1.8 } buildFeatures { @@ -44,30 +40,30 @@ android { } dependencies { - implementation fileTree(dir: 'libs', include: ['*.jar']) + implementation fileTree(dir: "libs", include: ["*.jar"]) // AndroidX implementation 'androidx.core:core-ktx:1.9.0' implementation 'androidx.appcompat:appcompat:1.6.1' implementation 'androidx.constraintlayout:constraintlayout:2.1.4' - implementation 'androidx.coordinatorlayout:coordinatorlayout:1.2.0' + implementation "androidx.coordinatorlayout:coordinatorlayout:1.2.0" implementation 'androidx.preference:preference-ktx:1.2.0' implementation 'androidx.navigation:navigation-fragment-ktx:2.5.3' implementation 'androidx.navigation:navigation-ui-ktx:2.5.3' implementation 'androidx.recyclerview:recyclerview:1.3.0' implementation 'androidx.room:room-runtime:2.5.1' - implementation 'androidx.cardview:cardview:1.0.0' + implementation "androidx.cardview:cardview:1.0.0" implementation 'androidx.legacy:legacy-support-v4:1.0.0' // Google GMS implementation 'com.google.android.gms:play-services-cast-framework:21.3.0' // Android Material - implementation 'com.google.android.material:material:1.10.0-alpha01' + implementation 'com.google.android.material:material:1.9.0-alpha02' // SearchBar implementation 'com.paulrybitskyi.persistentsearchview:persistentsearchview:1.1.4' - implementation 'com.arthurivanets.adapster:adapster:1.0.13' + implementation "com.arthurivanets.adapster:adapster:1.0.13" // Glide implementation 'com.github.bumptech.glide:glide:4.15.1' diff --git a/app/src/main/java/com/cappielloantonio/play/database/AppDatabase.java b/app/src/main/java/com/cappielloantonio/play/database/AppDatabase.java index aedb0dc3..e7ef7ff5 100644 --- a/app/src/main/java/com/cappielloantonio/play/database/AppDatabase.java +++ b/app/src/main/java/com/cappielloantonio/play/database/AppDatabase.java @@ -20,9 +20,9 @@ import com.cappielloantonio.play.model.RecentSearch; import com.cappielloantonio.play.model.Server; @Database( - version = 63, - entities = {Queue.class, Server.class, RecentSearch.class, Download.class, Chronology.class} - // autoMigrations = {@AutoMigration(from = 62, to = 63)} + version = 62, + entities = {Queue.class, Server.class, RecentSearch.class, Download.class, Chronology.class}, + autoMigrations = {@AutoMigration(from = 61, to = 62)} ) @TypeConverters({DateConverters.class}) public abstract class AppDatabase extends RoomDatabase { diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index fc1a51db..1bca44ce 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Thu Apr 06 12:38:54 CEST 2023 +#Wed Nov 04 18:13:42 CET 2020 distributionBase=GRADLE_USER_HOME -distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.2-bin.zip distributionPath=wrapper/dists -zipStorePath=wrapper/dists zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip