Update minSdkVersion to 24 and remove deprecated code

lib/build.gradle.kts

@@ -16,7 +16,7 @@ android {
     namespace = "at.bitfire.synctools"
 
     defaultConfig {
-        minSdk = 23        // Android 6
+        minSdk = 24        // Android 7
 
         testInstrumentationRunner = "at.bitfire.synctools.LoggingTestRunner"
 

lib/src/androidTest/kotlin/at/bitfire/ical4android/AospTest.kt

@@ -14,7 +14,7 @@ import android.net.Uri
 import android.provider.CalendarContract
 import androidx.test.platform.app.InstrumentationRegistry
 import androidx.test.rule.GrantPermissionRule
-import at.bitfire.ical4android.util.MiscUtils.closeCompat
+
 import org.junit.After
 import org.junit.Assert.assertNotNull
 import org.junit.Before
@@ -52,7 +52,7 @@ class AospTest {
     @After
     fun shutdown() {
         provider.delete(calendarUri, null, null)
-        provider.closeCompat()
+        provider.close()
     }
 
     private fun Uri.asSyncAdapter() =

lib/src/androidTest/kotlin/at/bitfire/ical4android/JtxCollectionTest.kt

@@ -12,7 +12,7 @@ import android.content.ContentValues
 import androidx.test.platform.app.InstrumentationRegistry
 import at.bitfire.ical4android.impl.TestJtxCollection
 import at.bitfire.ical4android.impl.testProdId
-import at.bitfire.ical4android.util.MiscUtils.closeCompat
+
 import at.bitfire.synctools.test.GrantPermissionOrSkipRule
 import at.techbee.jtx.JtxContract
 import at.techbee.jtx.JtxContract.asSyncAdapter
@@ -57,7 +57,7 @@ class JtxCollectionTest {
 
     @After
     fun tearDown() {
-        client.closeCompat()
+        client.close()
 
         var collections = JtxCollection.find(testAccount, client, context, TestJtxCollection.Factory, null, null)
         collections.forEach { collection ->

lib/src/androidTest/kotlin/at/bitfire/ical4android/JtxICalObjectTest.kt

@@ -15,7 +15,7 @@ import androidx.core.content.pm.PackageInfoCompat
 import androidx.test.platform.app.InstrumentationRegistry
 import at.bitfire.ical4android.impl.TestJtxCollection
 import at.bitfire.ical4android.impl.testProdId
-import at.bitfire.ical4android.util.MiscUtils.closeCompat
+
 import at.bitfire.synctools.test.GrantPermissionOrSkipRule
 import at.techbee.jtx.JtxContract
 import at.techbee.jtx.JtxContract.JtxICalObject
@@ -117,7 +117,7 @@ class JtxICalObjectTest {
 
     @After
     fun tearDown() {
-        client.closeCompat()
+        client.close()
         collection?.delete()
         val collections = JtxCollection.find(testAccount, client, context, TestJtxCollection.Factory, null, null)
         assertEquals(0, collections.size)

lib/src/androidTest/kotlin/at/bitfire/synctools/storage/JtxBatchOperationTest.kt

@@ -15,7 +15,7 @@ import at.bitfire.ical4android.JtxCollection
 import at.bitfire.ical4android.JtxICalObject
 import at.bitfire.ical4android.TaskProvider
 import at.bitfire.ical4android.util.MiscUtils.asSyncAdapter
-import at.bitfire.ical4android.util.MiscUtils.closeCompat
+
 import at.bitfire.synctools.test.BuildConfig
 import at.bitfire.synctools.test.GrantPermissionOrSkipRule
 import at.techbee.jtx.JtxContract
@@ -42,7 +42,7 @@ class JtxBatchOperationTest {
 
     @After
     fun tearDown() {
-        provider.closeCompat()
+        provider.close()
     }
 
 

lib/src/androidTest/kotlin/at/bitfire/synctools/storage/calendar/AndroidCalendarProviderBehaviorTest.kt

@@ -17,7 +17,7 @@ import androidx.core.content.contentValuesOf
 import androidx.test.platform.app.InstrumentationRegistry
 import androidx.test.rule.GrantPermissionRule
 import at.bitfire.ical4android.impl.TestCalendar
-import at.bitfire.ical4android.util.MiscUtils.closeCompat
+
 import at.bitfire.synctools.storage.LocalStorageException
 import at.bitfire.synctools.test.assertContentValuesEqual
 import org.junit.After
@@ -53,7 +53,7 @@ class AndroidCalendarProviderBehaviorTest {
 
     @After
     fun tearDown() {
-        client.closeCompat()
+        client.close()
     }
 
 

lib/src/androidTest/kotlin/at/bitfire/synctools/storage/calendar/AndroidCalendarProviderTest.kt

@@ -18,7 +18,7 @@ import androidx.core.content.contentValuesOf
 import androidx.test.platform.app.InstrumentationRegistry
 import androidx.test.rule.GrantPermissionRule
 import at.bitfire.ical4android.impl.TestCalendar
-import at.bitfire.ical4android.util.MiscUtils.closeCompat
+
 import at.bitfire.synctools.icalendar.Css3Color
 import org.junit.After
 import org.junit.Assert.assertEquals
@@ -45,7 +45,7 @@ class AndroidCalendarProviderTest {
 
     @After
     fun tearDown() {
-        client.closeCompat()
+        client.close()
     }
 
 

lib/src/androidTest/kotlin/at/bitfire/synctools/storage/calendar/AndroidCalendarTest.kt

@@ -17,7 +17,7 @@ import android.provider.CalendarContract.Reminders
 import androidx.core.content.contentValuesOf
 import androidx.test.platform.app.InstrumentationRegistry
 import at.bitfire.ical4android.impl.TestCalendar
-import at.bitfire.ical4android.util.MiscUtils.closeCompat
+
 import at.bitfire.synctools.storage.BatchOperation
 import at.bitfire.synctools.test.InitCalendarProviderRule
 import at.bitfire.synctools.test.assertContentValuesEqual
@@ -56,7 +56,7 @@ class AndroidCalendarTest {
     @After
     fun tearDown() {
         calendar.delete()
-        client.closeCompat()
+        client.close()
     }
 
 

lib/src/androidTest/kotlin/at/bitfire/synctools/storage/calendar/AndroidRecurringCalendarTest.kt

@@ -16,7 +16,7 @@ import android.provider.CalendarContract.Events
 import androidx.core.content.contentValuesOf
 import androidx.test.platform.app.InstrumentationRegistry
 import at.bitfire.ical4android.impl.TestCalendar
-import at.bitfire.ical4android.util.MiscUtils.closeCompat
+
 import at.bitfire.synctools.test.InitCalendarProviderRule
 import at.bitfire.synctools.test.assertContentValuesEqual
 import at.bitfire.synctools.test.assertEventAndExceptionsEqual
@@ -62,7 +62,7 @@ class AndroidRecurringCalendarTest {
     @After
     fun tearDown() {
         calendar.delete()
-        client.closeCompat()
+        client.close()
     }
 
 

lib/src/androidTest/kotlin/at/bitfire/synctools/storage/calendar/CalendarBatchOperationTest.kt

@@ -13,7 +13,7 @@ import android.provider.CalendarContract
 import androidx.test.platform.app.InstrumentationRegistry
 import androidx.test.rule.GrantPermissionRule
 import at.bitfire.ical4android.util.MiscUtils.asSyncAdapter
-import at.bitfire.ical4android.util.MiscUtils.closeCompat
+
 import at.bitfire.synctools.storage.BatchOperation
 import org.junit.After
 import org.junit.Before
@@ -46,7 +46,7 @@ class CalendarBatchOperationTest {
             "${CalendarContract.Events.ACCOUNT_TYPE}=? AND ${CalendarContract.Events.ACCOUNT_NAME}=?",
             arrayOf(testAccount.type, testAccount.name)
         )
-        provider.closeCompat()
+        provider.close()
     }
 
 

lib/src/androidTest/kotlin/at/bitfire/synctools/storage/tasks/ContactsBatchOperationTest.kt

@@ -12,7 +12,7 @@ import android.content.ContentProviderClient
 import android.provider.ContactsContract
 import androidx.test.platform.app.InstrumentationRegistry
 import androidx.test.rule.GrantPermissionRule
-import at.bitfire.ical4android.util.MiscUtils.closeCompat
+
 import at.bitfire.synctools.storage.BatchOperation
 import at.bitfire.synctools.storage.ContactsBatchOperation
 import at.bitfire.synctools.storage.LocalStorageException
@@ -48,7 +48,7 @@ class ContactsBatchOperationTest {
             "${ContactsContract.RawContacts.ACCOUNT_TYPE}=? AND ${ContactsContract.RawContacts.ACCOUNT_NAME}=?",
             arrayOf(testAccount.type, testAccount.name)
         )
-        provider.closeCompat()
+        provider.close()
     }
 
 

lib/src/main/kotlin/at/bitfire/ical4android/TaskProvider.kt

@@ -11,7 +11,7 @@ import android.content.ContentProviderClient
 import android.content.Context
 import android.content.pm.PackageManager
 import androidx.core.content.pm.PackageInfoCompat
-import at.bitfire.ical4android.util.MiscUtils.closeCompat
+
 import java.io.Closeable
 import java.util.logging.Level
 import java.util.logging.Logger
@@ -138,7 +138,7 @@ class TaskProvider private constructor(
 
 
     override fun close() {
-        client.closeCompat()
+        client.close()
     }
 
 

lib/src/main/kotlin/at/bitfire/ical4android/util/MiscUtils.kt

@@ -16,13 +16,7 @@ object MiscUtils {
 
     // various extension methods
 
-    fun ContentProviderClient.closeCompat() {
-        @Suppress("DEPRECATION")
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N)
-            close()
-        else
-            release()
-    }
+
 
     fun Uri.asSyncAdapter(account: Account): Uri = buildUpon()
         .appendQueryParameter(CalendarContract.Calendars.ACCOUNT_NAME, account.name)