diff --git a/app/build.gradle b/app/build.gradle index 04a73f4..77472e4 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -65,7 +65,9 @@ android { exclude 'META-INF/NOTICE' exclude 'META-INF/NOTICE.txt' exclude 'META-INF/notice.txt' + exclude 'META-INF/AL2.0' exclude 'META-INF/ASL2.0' + exclude 'META-INF/LGPL2.1' exclude 'README.md' exclude("META-INF/*.kotlin_module") } @@ -78,10 +80,9 @@ android { } dependencies { - implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" - implementation 'androidx.core:core-ktx:1.6.0' + implementation 'androidx.core:core-ktx:1.7.0' implementation 'androidx.core:core-splashscreen:1.0.0-alpha02' - implementation 'androidx.appcompat:appcompat:1.3.1' + implementation 'androidx.appcompat:appcompat:1.4.0' implementation "androidx.preference:preference-ktx:1.1.1" implementation 'androidx.recyclerview:recyclerview:1.2.1' implementation "androidx.swiperefreshlayout:swiperefreshlayout:1.1.0" @@ -97,14 +98,14 @@ dependencies { implementation 'com.google.firebase:firebase-crashlytics-ktx:18.2.1' implementation "com.mikepenz:aboutlibraries-core:$about_libraries_version" implementation "com.mikepenz:aboutlibraries:$about_libraries_version" - implementation 'androidx.constraintlayout:constraintlayout:2.1.0' + implementation 'androidx.constraintlayout:constraintlayout:2.1.2' implementation "androidx.multidex:multidex:2.0.1" implementation 'androidx.navigation:navigation-fragment-ktx:2.3.5' implementation 'androidx.navigation:navigation-ui-ktx:2.3.5' - implementation "dev.kord:kord-core:0.8.0-M4" + implementation "dev.kord:kord-core:0.8.0-M8" implementation 'io.github.medyo:android-about-page:2.0.0' implementation 'me.ibrahimyilmaz:kiel:1.2.1' - implementation 'org.jsoup:jsoup:1.14.1' - implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.5.0' + implementation 'org.jsoup:jsoup:1.14.3' + implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.5.2' implementation fileTree(dir: 'libs', include: ['*.jar']) } \ No newline at end of file diff --git a/app/src/main/java/com/cyb3rko/cavedroid/MainActivity.kt b/app/src/main/java/com/cyb3rko/cavedroid/MainActivity.kt index a857a15..bea97b0 100644 --- a/app/src/main/java/com/cyb3rko/cavedroid/MainActivity.kt +++ b/app/src/main/java/com/cyb3rko/cavedroid/MainActivity.kt @@ -133,7 +133,7 @@ class MainActivity : AppCompatActivity() { val guild = kord.getGuild(Snowflake(195206438623248384))!! val messageObject = (guild.getChannel(Snowflake(265060069194858496)) as MessageChannel).getLastMessage()!! - if (force || messageObject.id.value != sharedPreferences.getLong(LATEST_MESSAGE, 0)) { + if (force || messageObject.id.value.toLong() != sharedPreferences.getLong(LATEST_MESSAGE, 0)) { showAnnouncementDialog(guild, messageObject, sharedPreferences) } } @@ -212,7 +212,7 @@ class MainActivity : AppCompatActivity() { } } - sharedPreferences.edit().putLong(LATEST_MESSAGE, messageObject.id.value).apply() + sharedPreferences.edit().putLong(LATEST_MESSAGE, messageObject.id.value.toLong()).apply() } override fun onSupportNavigateUp(): Boolean { diff --git a/build.gradle b/build.gradle index 4d8e893..975ff16 100644 --- a/build.gradle +++ b/build.gradle @@ -1,7 +1,6 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. buildscript { - ext.about_libraries_version = "8.3.0" - ext.kotlin_version = "1.5.21" + ext.about_libraries_version = "8.9.4" repositories { google() jcenter() @@ -14,7 +13,7 @@ buildscript { classpath "com.mikepenz.aboutlibraries.plugin:aboutlibraries-plugin:$about_libraries_version" classpath 'com.google.firebase:firebase-crashlytics-gradle:2.7.1' classpath 'com.google.gms:google-services:4.3.8' - classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" + classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.6.10" classpath "androidx.navigation:navigation-safe-args-gradle-plugin:2.3.5" classpath "com.klaxit.hiddensecrets:HiddenSecretsPlugin:0.1.2" }