From 5cb31aaeae3dede1da98ae0ee1eebc12f3c038fb Mon Sep 17 00:00:00 2001
From: Mohsen <msn.mirhoseini@gmail.com>
Date: Thu, 26 Jan 2023 18:55:00 +0100
Subject: [PATCH] Migrate to SDK v1.0.0-beta.6

---
 README.md                                |  6 +++---
 app/build.gradle.kts                     | 18 +++++++++---------
 app/src/main/res/values-night/themes.xml |  4 +---
 app/src/main/res/values/themes.xml       |  4 +---
 build.gradle.kts                         |  4 ++--
 5 files changed, 16 insertions(+), 20 deletions(-)

diff --git a/README.md b/README.md
index a97f884..273ffff 100644
--- a/README.md
+++ b/README.md
@@ -20,16 +20,16 @@ dependencyResolutionManagement {
 and then add this dependency to your application gradle:
 ```kotlin
 // Firework Android Traffic Aggregator SDK
-val fireworkSdkVersion = "1.0.0-beta.5"
+val fireworkSdkVersion = "1.0.0-beta.6"
 implementation("com.github.loopsocial:android_traffic_aggregator_sdk:$fireworkSdkVersion")  
 ```
 
 ## Min requirements
 The min Android API supported by the SDK is 21 and it is targeting API 33.
 ```groovy
-compileSdk = 33
+compileSdk = 31
 minSdk = 19
-targetSdk = 33
+targetSdk = 31
 ```
 
 ## SDK initialization
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index c1ba931..400c016 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -5,13 +5,13 @@ plugins {
 
 android {
     namespace = "com.firework.example.trafficaggregator"
-    compileSdk = 33
+    compileSdk = 31
 
     defaultConfig {
         applicationId = "com.firework.example.trafficaggregator"
 
         minSdk = 19
-        targetSdk = 33
+        targetSdk = 31
 
         versionCode = 1
         versionName = "1.0.0"
@@ -27,12 +27,12 @@ android {
     }
 
     compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_1_8
-        targetCompatibility = JavaVersion.VERSION_1_8
+        sourceCompatibility = JavaVersion.VERSION_11
+        targetCompatibility = JavaVersion.VERSION_11
     }
 
     kotlinOptions {
-        jvmTarget = JavaVersion.VERSION_1_8.toString()
+        jvmTarget = JavaVersion.VERSION_11.toString()
     }
 
     buildFeatures {
@@ -41,9 +41,9 @@ android {
 }
 
 dependencies {
-    implementation("androidx.core:core-ktx:1.9.0")
-    implementation("androidx.appcompat:appcompat:1.6.0")
-    implementation("com.google.android.material:material:1.7.0")
+    implementation("androidx.core:core-ktx:1.8.0")
+    implementation("androidx.appcompat:appcompat:1.4.2")
+    implementation("com.google.android.material:material:1.6.1")
     implementation("androidx.constraintlayout:constraintlayout:2.1.4")
 
     testImplementation("junit:junit:4.13.2")
@@ -52,6 +52,6 @@ dependencies {
     androidTestImplementation("androidx.test.espresso:espresso-core:3.5.1")
 
     // Firework Android Traffic Aggregator SDK
-    val fireworkSdkVersion = "1.0.0-beta.5"
+    val fireworkSdkVersion = "1.0.0-beta.6"
     implementation("com.github.loopsocial:android_traffic_aggregator_sdk:$fireworkSdkVersion")
 }
diff --git a/app/src/main/res/values-night/themes.xml b/app/src/main/res/values-night/themes.xml
index 799810a..2b8eea2 100644
--- a/app/src/main/res/values-night/themes.xml
+++ b/app/src/main/res/values-night/themes.xml
@@ -1,4 +1,4 @@
-<resources xmlns:tools="http://schemas.android.com/tools">
+<resources>
     <!-- Base application theme. -->
     <style name="Theme.FWTrafficAggregatorExample" parent="Theme.MaterialComponents.DayNight.DarkActionBar">
         <!-- Primary brand color. -->
@@ -9,8 +9,6 @@
         <item name="colorSecondary">@color/teal_200</item>
         <item name="colorSecondaryVariant">@color/teal_200</item>
         <item name="colorOnSecondary">@color/black</item>
-        <!-- Status bar color. -->
-        <item name="android:statusBarColor">?attr/colorPrimaryVariant</item>
         <!-- Customize your theme here. -->
     </style>
 </resources>
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index ff4b26c..24b8f24 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -1,4 +1,4 @@
-<resources xmlns:tools="http://schemas.android.com/tools">
+<resources>
     <!-- Base application theme. -->
     <style name="Theme.FWTrafficAggregatorExample" parent="Theme.MaterialComponents.DayNight.DarkActionBar">
         <!-- Primary brand color. -->
@@ -9,8 +9,6 @@
         <item name="colorSecondary">@color/teal_200</item>
         <item name="colorSecondaryVariant">@color/teal_700</item>
         <item name="colorOnSecondary">@color/black</item>
-        <!-- Status bar color. -->
-        <item name="android:statusBarColor">?attr/colorPrimaryVariant</item>
         <!-- Customize your theme here. -->
     </style>
 </resources>
diff --git a/build.gradle.kts b/build.gradle.kts
index 119858d..03b88d1 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -1,7 +1,7 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 plugins {
-    id ("com.android.application") version "7.3.1" apply false
-    id ("com.android.library") version "7.3.1" apply false
+    id ("com.android.application") version "7.4.0" apply false
+    id ("com.android.library") version "7.4.0" apply false
     id ("org.jetbrains.kotlin.android") version "1.7.20" apply false
     id ("org.jetbrains.kotlin.jvm") version "1.7.20" apply false
 }