From 0bc669959ef70b33b2636d416f2e7501351d640d Mon Sep 17 00:00:00 2001 From: Leonard Date: Thu, 21 Dec 2023 22:58:12 +0100 Subject: [PATCH] minor fixes --- .idea/appInsightsSettings.xml | 45 +++++++++++++++++++ .idea/migrations.xml | 10 +++++ app/build.gradle.kts | 5 ++- .../studiportal/data/database/AppDatabase.kt | 4 +- build.gradle.kts | 6 +-- gradle/wrapper/gradle-wrapper.properties | 2 +- 6 files changed, 64 insertions(+), 8 deletions(-) create mode 100644 .idea/appInsightsSettings.xml create mode 100644 .idea/migrations.xml diff --git a/.idea/appInsightsSettings.xml b/.idea/appInsightsSettings.xml new file mode 100644 index 0000000..d249c0e --- /dev/null +++ b/.idea/appInsightsSettings.xml @@ -0,0 +1,45 @@ + + + + + + \ No newline at end of file diff --git a/.idea/migrations.xml b/.idea/migrations.xml new file mode 100644 index 0000000..f8051a6 --- /dev/null +++ b/.idea/migrations.xml @@ -0,0 +1,10 @@ + + + + + + \ No newline at end of file diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 63439a1..7ff40af 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -112,13 +112,14 @@ dependencies { implementation("io.github.oneuiproject:icons:1.1.0") implementation("com.android.volley:volley:1.2.1") - implementation("org.jsoup:jsoup:1.16.2") + implementation("org.jsoup:jsoup:1.17.1") implementation("com.airbnb.android:lottie:6.2.0") implementation("androidx.core:core-splashscreen:1.0.1") implementation("androidx.core:core-animation:1.0.0-rc01") implementation("com.google.android.play:core:1.10.3") implementation("com.google.android.play:core-ktx:1.8.1") + //noinspection GradleDependency implementation("androidx.work:work-runtime-ktx:2.8.1") //noinspection GradleDependency implementation("androidx.hilt:hilt-work:1.0.0") @@ -126,7 +127,7 @@ dependencies { kapt("androidx.hilt:hilt-compiler:1.0.0") implementation("androidx.datastore:datastore-preferences:1.0.0") - val roomVersion = "2.6.0" + val roomVersion = "2.6.1" implementation("androidx.room:room-runtime:$roomVersion") implementation("androidx.room:room-ktx:$roomVersion") //noinspection KaptUsageInsteadOfKsp diff --git a/app/src/main/java/de/lemke/studiportal/data/database/AppDatabase.kt b/app/src/main/java/de/lemke/studiportal/data/database/AppDatabase.kt index dda316e..51de06e 100644 --- a/app/src/main/java/de/lemke/studiportal/data/database/AppDatabase.kt +++ b/app/src/main/java/de/lemke/studiportal/data/database/AppDatabase.kt @@ -21,10 +21,10 @@ abstract class AppDatabase : RoomDatabase() { } val MIGRATION_1_2 = object : Migration(1, 2) { - override fun migrate(database: SupportSQLiteDatabase) { + override fun migrate(db: SupportSQLiteDatabase) { //delete column id and set new primary key to examNumber + semester //Drop column isn't supported by SQLite, so the data must manually be moved - with(database) { + with(db) { execSQL("""CREATE TABLE exam_backup ( |examNumber TEXT NOT NULL, |name TEXT NOT NULL, diff --git a/build.gradle.kts b/build.gradle.kts index 55c0f6a..50048d1 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -6,7 +6,7 @@ buildscript { } dependencies { - classpath("com.android.tools.build:gradle:8.1.4") + classpath("com.android.tools.build:gradle:8.2.0") //classpath("com.google.devtools.ksp:com.google.devtools.ksp.gradle.plugin:1.9.0-1.0.11") } } @@ -20,8 +20,8 @@ allprojects { } plugins { - id("com.android.application") version "8.1.4" apply false - id("com.android.library") version "8.1.4" apply false + id("com.android.application") version "8.2.0" apply false + id("com.android.library") version "8.2.0" apply false id("org.jetbrains.kotlin.android") version "1.7.20" apply false id("com.google.dagger.hilt.android") version "2.42" apply false } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 978fe96..d812fa3 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ #Fri Nov 04 12:00:04 CET 2022 distributionBase=GRADLE_USER_HOME -distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-bin.zip distributionPath=wrapper/dists zipStorePath=wrapper/dists zipStoreBase=GRADLE_USER_HOME