From ef8a87a30fb5e6e7ff5f89ebcad71ca6f8a9f8c8 Mon Sep 17 00:00:00 2001 From: Ivan Iskandar <12537387+ivaniskandar@users.noreply.github.com> Date: Sun, 23 May 2021 01:48:27 +0700 Subject: [PATCH] Bump compileSdk to 30 (#5140) --- app/build.gradle.kts | 4 ++-- .../kanade/tachiyomi/data/backup/BackupCreateService.kt | 2 +- .../tachiyomi/data/notification/NotificationReceiver.kt | 8 ++++---- .../eu/kanade/tachiyomi/ui/webview/WebViewActivity.kt | 4 ++-- buildSrc/src/main/kotlin/AndroidConfig.kt | 2 +- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 3a18411715..410bd7c5e5 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -125,13 +125,13 @@ dependencies { // AndroidX libraries implementation("androidx.annotation:annotation:1.3.0-alpha01") - implementation("androidx.appcompat:appcompat:1.3.0-rc01") + implementation("androidx.appcompat:appcompat:1.3.0") implementation("androidx.biometric:biometric-ktx:1.2.0-alpha03") implementation("androidx.browser:browser:1.3.0") implementation("androidx.cardview:cardview:1.0.0") implementation("androidx.constraintlayout:constraintlayout:2.1.0-beta02") implementation("androidx.coordinatorlayout:coordinatorlayout:1.1.0") - implementation("androidx.core:core-ktx:1.3.2") + implementation("androidx.core:core-ktx:1.5.0") implementation("androidx.multidex:multidex:2.0.1") implementation("androidx.preference:preference-ktx:1.1.1") implementation("androidx.recyclerview:recyclerview:1.2.0") diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/backup/BackupCreateService.kt b/app/src/main/java/eu/kanade/tachiyomi/data/backup/BackupCreateService.kt index 9d1f92858e..9a7dffcae1 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/data/backup/BackupCreateService.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/data/backup/BackupCreateService.kt @@ -99,7 +99,7 @@ class BackupCreateService : Service() { if (intent == null) return START_NOT_STICKY try { - val uri = intent.getParcelableExtra(BackupConst.EXTRA_URI) + val uri = intent.getParcelableExtra(BackupConst.EXTRA_URI)!! val backupFlags = intent.getIntExtra(BackupConst.EXTRA_FLAGS, 0) val backupFileUri = FullBackupManager(this).createBackup(uri, backupFlags, false)?.toUri() val unifile = UniFile.fromUri(this, backupFileUri) diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/notification/NotificationReceiver.kt b/app/src/main/java/eu/kanade/tachiyomi/data/notification/NotificationReceiver.kt index 503795fd2f..ea3a073d78 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/data/notification/NotificationReceiver.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/data/notification/NotificationReceiver.kt @@ -58,21 +58,21 @@ class NotificationReceiver : BroadcastReceiver() { ACTION_SHARE_IMAGE -> shareImage( context, - intent.getStringExtra(EXTRA_FILE_LOCATION), + intent.getStringExtra(EXTRA_FILE_LOCATION)!!, intent.getIntExtra(EXTRA_NOTIFICATION_ID, -1) ) // Delete image from path and dismiss notification ACTION_DELETE_IMAGE -> deleteImage( context, - intent.getStringExtra(EXTRA_FILE_LOCATION), + intent.getStringExtra(EXTRA_FILE_LOCATION)!!, intent.getIntExtra(EXTRA_NOTIFICATION_ID, -1) ) // Share backup file ACTION_SHARE_BACKUP -> shareFile( context, - intent.getParcelableExtra(EXTRA_URI), + intent.getParcelableExtra(EXTRA_URI)!!, "application/x-protobuf+gzip", intent.getIntExtra(EXTRA_NOTIFICATION_ID, -1) ) @@ -106,7 +106,7 @@ class NotificationReceiver : BroadcastReceiver() { ACTION_SHARE_CRASH_LOG -> shareFile( context, - intent.getParcelableExtra(EXTRA_URI), + intent.getParcelableExtra(EXTRA_URI)!!, "text/plain", intent.getIntExtra(EXTRA_NOTIFICATION_ID, -1) ) diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/webview/WebViewActivity.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/webview/WebViewActivity.kt index c8da67c049..a66824e570 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/webview/WebViewActivity.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/webview/WebViewActivity.kt @@ -91,7 +91,7 @@ class WebViewActivity : BaseViewBindingActivity() { } } } else { - binding.webview.restoreState(bundle) + binding.webview.restoreState(bundle!!) } if (bundle == null) { @@ -199,7 +199,7 @@ class WebViewActivity : BaseViewBindingActivity() { } private fun openInBrowser() { - openInBrowser(binding.webview.url) + openInBrowser(binding.webview.url!!) } companion object { diff --git a/buildSrc/src/main/kotlin/AndroidConfig.kt b/buildSrc/src/main/kotlin/AndroidConfig.kt index 5dfa2a8abe..30dbd57a72 100644 --- a/buildSrc/src/main/kotlin/AndroidConfig.kt +++ b/buildSrc/src/main/kotlin/AndroidConfig.kt @@ -1,5 +1,5 @@ object AndroidConfig { - const val compileSdk = 29 + const val compileSdk = 30 const val minSdk = 23 const val targetSdk = 29 const val buildTools = "30.0.3"