Feature : Android 12 compatibility (#226)

* target and compile SDK version is now 31 + upgrade gradle and kotlin versions * pull Nordic Android sdk changes about ble permission on Android 12 * update CHANGELOG.md
OZEO-DOOZ · Feb 21, 2022 · c16f973 · c16f973
1 parent 5027187
commit c16f973
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 6 deletions.
diff --git a/Android-nRF-Mesh-Library-1 b/Android-nRF-Mesh-Library-1
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 ## 0.8.0
 
+- compile against Android 12 (API 31) and update BLE permissions in app's manifest
+
+## 0.8.0
+
 - Add DooZ scenario protocol V2 messages. `DoozEpochSet` and `DoozEpochStatus` are tested on both platforms, whereas `DoozScenarioSet` and `DoozScenarioStatus` are added in Android version but not used for now (prepare for next release)
 - Expose `ConfigModelPublicationGet` msg
 - Use of Nordic's Android SDK v3.1.7

diff --git a/android/build.gradle b/android/build.gradle
@@ -2,14 +2,14 @@ group 'fr.dooz.nordic_nrf_mesh'
 version '1.0-SNAPSHOT'
 
 buildscript {
-    ext.kotlin_version = '1.3.72'
+    ext.kotlin_version = '1.6.0'
     repositories {
         google()
         mavenCentral()
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.0.0'
+        classpath 'com.android.tools.build:gradle:4.1.3'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
     }
 }
@@ -25,13 +25,14 @@ apply plugin: 'com.android.library'
 apply plugin: 'kotlin-android'
 
 android {
-    compileSdkVersion 29
+    compileSdkVersion 31
 
     sourceSets {
         main.java.srcDirs += 'src/main/kotlin'
     }
     defaultConfig {
         minSdkVersion 23
+        targetSdkVersion 31
     }
     lintOptions {
         disable 'InvalidPackage'

diff --git a/example/pubspec.lock b/example/pubspec.lock
@@ -326,7 +326,7 @@ packages:
       path: ".."
       relative: true
     source: path
-    version: "0.8.0"
+    version: "0.9.0"
   package_config:
     dependency: transitive
     description:

diff --git a/pubspec.yaml b/pubspec.yaml
@@ -1,6 +1,6 @@
 name: nordic_nrf_mesh
 description: A Flutter plugin to enable mesh network management and communication using Nordic's SDKs. It also provides the ability to open BLE connection with mesh nodes using some other flutter package.
-version: 0.8.0
+version: 0.9.0
 
 environment:
   sdk: ">=2.12.0 <3.0.0"
+1 −1		mesh/build.gradle
+17 −2		mesh/src/main/AndroidManifest.xml