From 16702dc31d1fd0621ec13e989f98dda86a10f715 Mon Sep 17 00:00:00 2001 From: tibbi Date: Tue, 31 Dec 2019 11:39:10 +0100 Subject: [PATCH] updating gradle, kotlin, commons, target sdk to 29 --- app/build.gradle | 8 ++++---- .../thankyou/contentproviders/MyContentProvider.kt | 8 ++++---- build.gradle | 4 ++-- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 36255b9..9b09695 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -9,13 +9,13 @@ if (keystorePropertiesFile.exists()) { } android { - compileSdkVersion 28 - buildToolsVersion "28.0.3" + compileSdkVersion 29 + buildToolsVersion "29.0.2" defaultConfig { applicationId "com.simplemobiletools.thankyou" minSdkVersion 21 - targetSdkVersion 28 + targetSdkVersion 29 versionCode 14 versionName "5.0.2" setProperty("archivesBaseName", "thank-you") @@ -56,5 +56,5 @@ android { } dependencies { - implementation 'com.simplemobiletools:commons:5.17.17' + implementation 'com.simplemobiletools:commons:5.21.14' } diff --git a/app/src/main/kotlin/com/simplemobiletools/thankyou/contentproviders/MyContentProvider.kt b/app/src/main/kotlin/com/simplemobiletools/thankyou/contentproviders/MyContentProvider.kt index 0209845..9250688 100644 --- a/app/src/main/kotlin/com/simplemobiletools/thankyou/contentproviders/MyContentProvider.kt +++ b/app/src/main/kotlin/com/simplemobiletools/thankyou/contentproviders/MyContentProvider.kt @@ -8,18 +8,18 @@ import com.simplemobiletools.thankyou.dbhelpers.MyContentProviderDbHelper class MyContentProvider : ContentProvider() { lateinit var dbHelper: MyContentProviderDbHelper - override fun insert(uri: Uri, contentValues: ContentValues) = null + override fun insert(uri: Uri, contentValues: ContentValues?) = null override fun query(uri: Uri, projection: Array?, selection: String?, selectionArgs: Array?, sortOrder: String?) = dbHelper.getSharedTheme() override fun onCreate(): Boolean { - dbHelper = MyContentProviderDbHelper.newInstance(context) + dbHelper = MyContentProviderDbHelper.newInstance(context!!) return true } - override fun update(uri: Uri, contentValues: ContentValues, selection: String?, selectionArgs: Array?) = dbHelper.updateTheme(contentValues) + override fun update(uri: Uri, contentValues: ContentValues?, selection: String?, selectionArgs: Array?): Int = dbHelper.updateTheme(contentValues!!) - override fun delete(uri: Uri, selection: String, selectionArgs: Array) = 0 + override fun delete(uri: Uri, selection: String?, selectionArgs: Array?): Int = 0 override fun getType(uri: Uri) = "" } diff --git a/build.gradle b/build.gradle index d28a976..969a400 100644 --- a/build.gradle +++ b/build.gradle @@ -1,7 +1,7 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. buildscript { - ext.kotlin_version = '1.3.50' + ext.kotlin_version = '1.3.61' repositories { google() @@ -9,7 +9,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:3.5.2' + classpath 'com.android.tools.build:gradle:3.5.3' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" // NOTE: Do not place your application dependencies here; they belong