From dd5ed99e9783945ede8e9945c159877edb38df91 Mon Sep 17 00:00:00 2001
From: R0m4in-dooz <72380352+R0m4in-dooz@users.noreply.github.com>
Date: Tue, 26 Apr 2022 08:51:46 +0200
Subject: [PATCH] Feature: nordic and gradle upgrades (#243)

* pull Android-nRF-Mesh-Library v3.2.1

* upgrade kotlin and gradle version for example app

* fix changelog.md

* bump pkg version
---
 Android-nRF-Mesh-Library-1        | 2 +-
 CHANGELOG.md                      | 2 +-
 example/android/build.gradle      | 4 ++--
 example/android/gradle.properties | 4 +---
 example/pubspec.lock              | 2 +-
 pubspec.yaml                      | 2 +-
 6 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/Android-nRF-Mesh-Library-1 b/Android-nRF-Mesh-Library-1
index ac869d6af..8eb3ee50b 160000
--- a/Android-nRF-Mesh-Library-1
+++ b/Android-nRF-Mesh-Library-1
@@ -1 +1 @@
-Subproject commit ac869d6af46427d9ae64ece45b6ce5da01b7701c
+Subproject commit 8eb3ee50bb3b7b398d06d7d24d7058cede8b10d3
diff --git a/CHANGELOG.md b/CHANGELOG.md
index f11ccf83f..8e02d4b5d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,6 @@
 ## 0.12.0
 
-- Use of Nordic Semiconductor's Android SDK v3.1.9
+- Use of Nordic Semiconductor's Android SDK v3.2.1
 - Upgraded Gradle version and dependencies
 - Upgraded Dart dependencies
 
diff --git a/example/android/build.gradle b/example/android/build.gradle
index d25dad62d..a490ddfb4 100644
--- a/example/android/build.gradle
+++ b/example/android/build.gradle
@@ -1,12 +1,12 @@
 buildscript {
-    ext.kotlin_version = '1.6.10'
+    ext.kotlin_version = '1.6.20'
     repositories {
         google()
         mavenCentral()
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.0.0'
+        classpath 'com.android.tools.build:gradle:7.1.3'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
     }
 }
diff --git a/example/android/gradle.properties b/example/android/gradle.properties
index e52b37db6..4d3226abc 100644
--- a/example/android/gradle.properties
+++ b/example/android/gradle.properties
@@ -1,5 +1,3 @@
 org.gradle.jvmargs=-Xmx1536M
 android.useAndroidX=true
-android.enableJetifier=true
-
-VERSION_NAME=2.4.0
\ No newline at end of file
+android.enableJetifier=true
\ No newline at end of file
diff --git a/example/pubspec.lock b/example/pubspec.lock
index 7d2e129b7..6e2ae876a 100644
--- a/example/pubspec.lock
+++ b/example/pubspec.lock
@@ -298,7 +298,7 @@ packages:
       path: ".."
       relative: true
     source: path
-    version: "0.11.0"
+    version: "0.12.0"
   package_config:
     dependency: transitive
     description:
diff --git a/pubspec.yaml b/pubspec.yaml
index 0dd572766..d8ac6c122 100644
--- 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 Semiconductor's SDKs.
-version: 0.11.0
+version: 0.12.0
 homepage: https://www.dooz-domotique.com/
 repository: https://github.com/OZEO-DOOZ/nrf_mesh_plugin
 issue_tracker: https://github.com/OZEO-DOOZ/nrf_mesh_plugin/issues