From 496c48fc1d59b468a8bcf4c181ec6801203b0227 Mon Sep 17 00:00:00 2001
From: Patryk Michalik <contact@patrykmichalik.com>
Date: Tue, 26 Jul 2022 17:41:58 +0200
Subject: [PATCH] Update sample app to Blueprint 2.3.0

---
 app/build.gradle                         | 27 ++++++++++++------------
 build.gradle                             |  1 +
 buildSrc/src/main/java/MyApp.kt          |  4 ++--
 buildSrc/src/main/java/Plugins.kt        |  3 +++
 buildSrc/src/main/java/Versions.kt       | 13 ++++++------
 gradle.properties                        |  1 -
 gradle/wrapper/gradle-wrapper.properties |  6 +++---
 7 files changed, 30 insertions(+), 25 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 58eaa0d2d..a27825e82 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -18,10 +18,10 @@ apply plugin: 'com.onesignal.androidsdk.onesignal-gradle-plugin'
 apply plugin: 'com.android.application'
 apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-parcelize'
-apply plugin: 'kotlin-kapt'
+apply plugin: 'com.google.devtools.ksp'
 
 android {
-    lintOptions {
+    lint {
         abortOnError false
         checkReleaseBuilds true
         disable 'MissingTranslation', 'GoogleAppIndexingWarning'
@@ -46,13 +46,10 @@ android {
         proguardFiles 'proguard-android-optimize.txt', 'proguard-rules.pro'
         consumerProguardFiles 'proguard-android-optimize.txt', 'proguard-rules.pro'
 
-        javaCompileOptions {
-            annotationProcessorOptions {
-                arguments = [
-                        "room.schemaLocation"  : "$projectDir/schemas".toString(),
-                        "room.incremental"     : "true",
-                        "room.expandProjection": "true"]
-            }
+        ksp {
+            arg("room.schemaLocation", "$projectDir/schemas")
+            arg("room.incremental", "true")
+            arg("room.expandProjection", "true")
         }
     }
 
@@ -75,10 +72,14 @@ android {
     }
 
     packagingOptions {
-        pickFirst 'META-INF/core_debug.kotlin_module'
-        pickFirst 'META-INF/core_release.kotlin_module'
-        pickFirst 'META-INF/library_debug.kotlin_module'
-        pickFirst 'META-INF/library_release.kotlin_module'
+        resources {
+            pickFirsts += [
+                    'META-INF/core_debug.kotlin_module',
+                    'META-INF/core_release.kotlin_module',
+                    'META-INF/library_debug.kotlin_module',
+                    'META-INF/library_release.kotlin_module'
+            ]
+        }
     }
 
     compileOptions {
diff --git a/build.gradle b/build.gradle
index 7687860fc..3ce30b6e6 100644
--- a/build.gradle
+++ b/build.gradle
@@ -12,6 +12,7 @@ buildscript {
     dependencies {
         classpath Plugins.android
         classpath Plugins.kotlin
+        classpath Plugins.ksp
     }
 }
 
diff --git a/buildSrc/src/main/java/MyApp.kt b/buildSrc/src/main/java/MyApp.kt
index 04e8c6878..a2c6d8314 100644
--- a/buildSrc/src/main/java/MyApp.kt
+++ b/buildSrc/src/main/java/MyApp.kt
@@ -2,6 +2,6 @@
 
 object MyApp {
     const val appId = "dev.jahir.blueprint.app"
-    const val version = 228
-    const val versionName = "2.2.8"
+    const val version = 230
+    const val versionName = "2.3.0"
 }
diff --git a/buildSrc/src/main/java/Plugins.kt b/buildSrc/src/main/java/Plugins.kt
index 46713c0c0..0c9902f41 100644
--- a/buildSrc/src/main/java/Plugins.kt
+++ b/buildSrc/src/main/java/Plugins.kt
@@ -8,4 +8,7 @@ object Plugins {
     // OneSignal
     const val oneSignal =
         "gradle.plugin.com.onesignal:onesignal-gradle-plugin:${Versions.oneSignalPlugin}"
+    // KSP
+    const val ksp =
+        "com.google.devtools.ksp:com.google.devtools.ksp.gradle.plugin:${Versions.ksp}"
 }
diff --git a/buildSrc/src/main/java/Versions.kt b/buildSrc/src/main/java/Versions.kt
index c9f245a14..bde11dc27 100644
--- a/buildSrc/src/main/java/Versions.kt
+++ b/buildSrc/src/main/java/Versions.kt
@@ -2,18 +2,19 @@
 
 object Versions {
     // Plugins
-    const val gradle = "7.1.1"
-    const val kotlin = "1.5.31"
+    const val gradle = "7.2.1"
+    const val kotlin = "1.7.0"
+    const val ksp = "$kotlin-1.0.6"
 
     // OneSignal
     const val oneSignalPlugin = "0.14.0"
-    const val oneSignal = "4.6.7"
+    const val oneSignal = "4.8.1"
 
     // App
     const val minSdk = 21
-    const val targetSdk = 31
-    const val buildTools = "30.0.3"
+    const val targetSdk = 32
+    const val buildTools = "32.0.0"
 
     // Blueprint
-    const val blueprint = "2.2.8"
+    const val blueprint = "2.3.0"
 }
diff --git a/gradle.properties b/gradle.properties
index 33a40e6e6..23339e0df 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -19,4 +19,3 @@ android.useAndroidX=true
 android.enableJetifier=true
 # Kotlin code style for this project: "official" or "obsolete":
 kotlin.code.style=official
-kapt.incremental.apt=true
\ No newline at end of file
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 0f9c23e5d..7c258dce9 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Tue Mar 17 11:14:49 COT 2020
+#Sun Jul 24 22:47:34 CEST 2022
 distributionBase=GRADLE_USER_HOME
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip
 distributionPath=wrapper/dists
-zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
+zipStoreBase=GRADLE_USER_HOME