Android Gradle Plugin, JUnit, Kotlin and Mapbox updated; removed deprecated 'kotlin-android-extensions' plugin and replaced with 'kotlin-parcelize' (plugin) and viewBinding (demo app)

Author: xit0c

.idea/codeStyles/Project.xml

@@ -5,7 +5,7 @@ An alternative to [Mapbox offline plugin](https://github.com/mapbox/mapbox-plugi
 
 This plugin is published to [Bintray's JCenter](https://bintray.com/bintray/jcenter). Include it in your `build.gradle` file with
 ```gradle
-implementation 'dev.micheleferretti:mapbox-plugin-offline:2.2.3'
+implementation 'dev.micheleferretti:mapbox-plugin-offline:2.2.4'
 ```
 
 ## Usage

.idea/codeStyles/codeStyleConfig.xml

@@ -1,6 +1,5 @@
 apply plugin: 'com.android.application'
 apply plugin: 'kotlin-android'
-apply plugin: 'kotlin-android-extensions'
 
 android {
     compileSdkVersion 30
@@ -12,6 +11,9 @@ android {
         versionName "1.0"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
+    buildFeatures {
+        viewBinding true
+    }
     buildTypes {
         debug {
             buildConfigField('String', 'MAPBOX_ACCESS_TOKEN', '"' + mapbox_access_token + '"' )
@@ -33,7 +35,7 @@ dependencies {
     implementation 'androidx.appcompat:appcompat:1.2.0'
     implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
     implementation "androidx.core:core-ktx:$androidx_core_version"
-    implementation 'androidx.recyclerview:recyclerview:1.1.0'
+    implementation 'androidx.recyclerview:recyclerview:1.2.0'
 
     // Mapbox
     implementation "com.mapbox.mapboxsdk:mapbox-android-sdk:$mapbox_version"

README.md

@@ -16,26 +16,31 @@ import dev.micheleferretti.mapboxpluginoffline.OfflineService
 import dev.micheleferretti.mapboxpluginoffline.model.NotificationOptions
 import dev.micheleferretti.mapboxpluginoffline.model.OfflineDownload
 import dev.micheleferretti.mapboxpluginoffline.model.OfflineDownloadOptions
-import kotlinx.android.synthetic.main.activity_demo.*
+import dev.micheleferretti.mapboxpluginofflinedemo.databinding.ActivityDemoBinding
 
-class DemoActivity : AppCompatActivity(R.layout.activity_demo), View.OnClickListener {
+class DemoActivity : AppCompatActivity(), View.OnClickListener {
+
+    private lateinit var binding: ActivityDemoBinding
 
     private val logAdapter = LogAdapter()
     private val receiver = Receiver()
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        active_downloads_btn.setOnClickListener(this)
-        download_btn.setOnClickListener(this)
-        logs_rv.apply {
+        binding = ActivityDemoBinding.inflate(layoutInflater)
+        setContentView(binding.root)
+
+        binding.activeDownloadsBtn.setOnClickListener(this)
+        binding.downloadBtn.setOnClickListener(this)
+        binding.logsRv.apply {
             setHasFixedSize(true)
             addItemDecoration(DividerItemDecoration(context, RecyclerView.VERTICAL))
             layoutManager = LinearLayoutManager(context, RecyclerView.VERTICAL, true)
             adapter = logAdapter
         }
 
-        map?.onCreate(savedInstanceState)
-        map?.getMapAsync { it.setStyle(Style.MAPBOX_STREETS) }
+        binding.map.onCreate(savedInstanceState)
+        binding.map.getMapAsync { it.setStyle(Style.MAPBOX_STREETS) }
     }
 
     override fun onClick(v: View?) {
@@ -45,7 +50,7 @@ class DemoActivity : AppCompatActivity(R.layout.activity_demo), View.OnClickList
                 Toast.makeText(v.context, "Count: ${receiver.getActiveDownloads().size}", Toast.LENGTH_SHORT).show()
             }
             R.id.download_btn -> {
-                map?.getMapAsync {
+                binding.map.getMapAsync {
                     OfflineService.startDownload(this, OfflineDownloadOptions(
                         OfflineTilePyramidRegionDefinition(
                             Style.MAPBOX_STREETS,
@@ -73,39 +78,39 @@ class DemoActivity : AppCompatActivity(R.layout.activity_demo), View.OnClickList
 
     override fun onStart() {
         super.onStart()
-        map?.onStart()
+        binding.map.onStart()
         receiver.register(this)
     }
 
     override fun onResume() {
         super.onResume()
-        map?.onResume()
+        binding.map.onResume()
     }
 
     override fun onPause() {
         super.onPause()
-        map?.onPause()
+        binding.map.onPause()
     }
 
     override fun onStop() {
         super.onStop()
-        map?.onStop()
+        binding.map.onStop()
         receiver.unregister(this)
     }
 
     override fun onSaveInstanceState(outState: Bundle) {
         super.onSaveInstanceState(outState)
-        map?.onSaveInstanceState(outState)
+        binding.map.onSaveInstanceState(outState)
     }
 
     override fun onLowMemory() {
         super.onLowMemory()
-        map?.onLowMemory()
+        binding.map.onLowMemory()
     }
 
     override fun onDestroy() {
         super.onDestroy()
-        map?.onDestroy()
+        binding.map.onDestroy()
     }
 
     // Receiver class

app/build.gradle

@@ -4,9 +4,9 @@ buildscript {
         androidx_test_runner_version = '1.3.0'
         androidx_test_espresso_version = '3.3.0'
         androidx_test_junit_version = '1.1.2'
-        junit_version = '4.12'
-        kotlin_version = '1.4.10'
-        mapbox_version = '9.6.0'
+        junit_version = '4.13.2'
+        kotlin_version = '1.4.32'
+        mapbox_version = '9.6.1'
 
         File secretPropsFile = file('secret.properties')
         Properties secretProps = new Properties()
@@ -22,7 +22,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.1.0'
+        classpath 'com.android.tools.build:gradle:4.1.3'
         classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.5'
         classpath 'org.jetbrains.dokka:dokka-gradle-plugin:0.10.1'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"

app/src/main/java/dev/micheleferretti/mapboxpluginofflinedemo/DemoActivity.kt

@@ -1,6 +1,6 @@
 apply plugin: 'com.android.library'
 apply plugin: 'kotlin-android'
-apply plugin: 'kotlin-android-extensions'
+apply plugin: 'kotlin-parcelize'
 apply plugin: 'org.jetbrains.dokka'
 apply plugin: 'maven-publish'
 apply plugin: 'com.jfrog.bintray'
@@ -16,7 +16,7 @@ android {
         minSdkVersion 14
         targetSdkVersion 30
         versionCode 1
-        versionName '2.2.3'
+        versionName '2.2.4'
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         archivesBaseName = "$archivesBaseName-$versionName"
     }

build.gradle

@@ -3,7 +3,7 @@ package dev.micheleferretti.mapboxpluginoffline.model
 import android.os.Parcelable
 import androidx.annotation.DrawableRes
 import dev.micheleferretti.mapboxpluginoffline.utils.OfflineUtils
-import kotlinx.android.parcel.Parcelize
+import kotlinx.parcelize.Parcelize
 
 /**
  * This model represents the options for the notification shown by

mapboxpluginoffline/build.gradle

@@ -4,7 +4,7 @@ import android.os.Parcelable
 import com.mapbox.mapboxsdk.offline.OfflineRegion
 import com.mapbox.mapboxsdk.offline.OfflineRegionStatus
 import dev.micheleferretti.mapboxpluginoffline.utils.OfflineUtils
-import kotlinx.android.parcel.Parcelize
+import kotlinx.parcelize.Parcelize
 
 /**
  * This model represents the download managed by

mapboxpluginoffline/src/main/java/dev/micheleferretti/mapboxpluginoffline/model/NotificationOptions.kt

@@ -4,7 +4,7 @@ import android.os.Parcelable
 import com.mapbox.mapboxsdk.offline.OfflineRegionDefinition
 import dev.micheleferretti.mapboxpluginoffline.utils.OfflineUtils
 import dev.micheleferretti.mapboxpluginoffline.utils.convertToString
-import kotlinx.android.parcel.Parcelize
+import kotlinx.parcelize.Parcelize
 
 /**
  * This model represents the options for the download managed by