From 120b171f505be1933f6efb85aeb0a97aa5591753 Mon Sep 17 00:00:00 2001 From: Chris Banes Date: Tue, 15 Sep 2020 09:17:52 +0100 Subject: [PATCH] Compile against SDK 30 --- .../accompanist/buildsrc/dependencies.kt | 4 ++-- coil/build.gradle | 2 +- gradle/wrapper/gradle-wrapper.properties | 2 +- sample/build.gradle | 4 ++-- .../accompanist/sample/MainActivity.kt | 11 ++++++---- .../accompanist/sample/SampleApplication.kt | 20 ++++++++++--------- 6 files changed, 24 insertions(+), 19 deletions(-) diff --git a/buildSrc/src/main/java/dev/chrisbanes/accompanist/buildsrc/dependencies.kt b/buildSrc/src/main/java/dev/chrisbanes/accompanist/buildsrc/dependencies.kt index d4bd7ea21..53ee797bb 100644 --- a/buildSrc/src/main/java/dev/chrisbanes/accompanist/buildsrc/dependencies.kt +++ b/buildSrc/src/main/java/dev/chrisbanes/accompanist/buildsrc/dependencies.kt @@ -17,11 +17,11 @@ package dev.chrisbanes.accompanist.buildsrc object Versions { - const val ktlint = "0.37.2" + const val ktlint = "0.38.1" } object Libs { - const val androidGradlePlugin = "com.android.tools.build:gradle:4.2.0-alpha09" + const val androidGradlePlugin = "com.android.tools.build:gradle:4.2.0-alpha10" const val gradleMavenPublishPlugin = "com.vanniktech:gradle-maven-publish-plugin:0.12.0" diff --git a/coil/build.gradle b/coil/build.gradle index 832b6df91..c271c8914 100644 --- a/coil/build.gradle +++ b/coil/build.gradle @@ -21,7 +21,7 @@ apply plugin: 'com.android.library' apply plugin: 'kotlin-android' android { - compileSdkVersion 29 + compileSdkVersion 30 defaultConfig { minSdkVersion 21 diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 9952b4b85..dd3ed3cc2 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -18,4 +18,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.6-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-6.6.1-bin.zip diff --git a/sample/build.gradle b/sample/build.gradle index 3bf8442ac..2a368af67 100644 --- a/sample/build.gradle +++ b/sample/build.gradle @@ -21,12 +21,12 @@ apply plugin: 'com.android.application' apply plugin: 'kotlin-android' android { - compileSdkVersion 29 + compileSdkVersion 30 defaultConfig { applicationId "dev.chrisbanes.insetter.sample" minSdkVersion 21 - targetSdkVersion 29 + targetSdkVersion 30 versionCode 1 versionName "1.0" diff --git a/sample/src/main/java/dev/chrisbanes/accompanist/sample/MainActivity.kt b/sample/src/main/java/dev/chrisbanes/accompanist/sample/MainActivity.kt index 5db7d0bee..c43b2fedf 100644 --- a/sample/src/main/java/dev/chrisbanes/accompanist/sample/MainActivity.kt +++ b/sample/src/main/java/dev/chrisbanes/accompanist/sample/MainActivity.kt @@ -14,9 +14,11 @@ * limitations under the License. */ +@file:Suppress("DEPRECATION") // ListActivity + package dev.chrisbanes.accompanist.sample -import android.R +import android.annotation.SuppressLint import android.app.ListActivity import android.content.Intent import android.os.Bundle @@ -40,9 +42,9 @@ class MainActivity : ListActivity() { listAdapter = SimpleAdapter( this, getData(intent.getStringExtra(EXTRA_PATH)), - R.layout.simple_list_item_1, + android.R.layout.simple_list_item_1, arrayOf("title"), - intArrayOf(R.id.text1) + intArrayOf(android.R.id.text1) ) listView.isTextFilterEnabled = true @@ -54,7 +56,8 @@ class MainActivity : ListActivity() { val mainIntent = Intent(Intent.ACTION_MAIN, null) mainIntent.addCategory("dev.chrisbanes.accompanist.sample.SAMPLE_CODE") - val list = packageManager.queryIntentActivities(mainIntent, 0) ?: return myData + @SuppressLint("QueryPermissionsNeeded") // Only querying our own Activities + val list = packageManager.queryIntentActivities(mainIntent, 0) val prefixPath: Array? var prefixWithSlash = prefix diff --git a/sample/src/main/java/dev/chrisbanes/accompanist/sample/SampleApplication.kt b/sample/src/main/java/dev/chrisbanes/accompanist/sample/SampleApplication.kt index 8ac02df2d..7025ebfe5 100644 --- a/sample/src/main/java/dev/chrisbanes/accompanist/sample/SampleApplication.kt +++ b/sample/src/main/java/dev/chrisbanes/accompanist/sample/SampleApplication.kt @@ -28,16 +28,18 @@ class SampleApplication : Application() { override fun onCreate() { super.onCreate() - Coil.setImageLoader(object : ImageLoaderFactory { - override fun newImageLoader(): ImageLoader { - val coilOkHttpClient = OkHttpClient.Builder() - .cache(CoilUtils.createDefaultCache(this@SampleApplication)) - .build() + Coil.setImageLoader( + object : ImageLoaderFactory { + override fun newImageLoader(): ImageLoader { + val coilOkHttpClient = OkHttpClient.Builder() + .cache(CoilUtils.createDefaultCache(this@SampleApplication)) + .build() - return ImageLoader.Builder(this@SampleApplication) - .okHttpClient(coilOkHttpClient) - .build() + return ImageLoader.Builder(this@SampleApplication) + .okHttpClient(coilOkHttpClient) + .build() + } } - }) + ) } }