From 985a5658f06b3949949fd59e97e006934098e1f9 Mon Sep 17 00:00:00 2001
From: Bogdan Terehov <bogdan.terehov>
Date: Wed, 27 Dec 2023 23:28:36 +0300
Subject: [PATCH 1/2] =?UTF-8?q?feature=20MIR-6740:=20[Android]=20=D0=94?=
 =?UTF-8?q?=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5=D0=BD=D0=B8=D0=B5=20=D0=BF?=
 =?UTF-8?q?=D0=BE=D0=B4=D0=B4=D0=B5=D1=80=D0=B6=D0=BA=D0=B8=20Android=2014?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

migrate to gradle 8.0
---
 android-configs/common-config.gradle | 10 +++++-----
 kotlin-extensions/build.gradle       |  4 ++++
 logging/build.gradle                 |  4 ++++
 recyclerview-decorators/build.gradle |  4 ++++
 utils/build.gradle                   |  4 ++++
 5 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/android-configs/common-config.gradle b/android-configs/common-config.gradle
index e189a5f..1191f11 100644
--- a/android-configs/common-config.gradle
+++ b/android-configs/common-config.gradle
@@ -1,10 +1,10 @@
 apply plugin: 'kotlin-android'
 
 rootProject.ext {
-    compileSdk = 30
+    compileSdk = 34
 
     minSdk = 21
-    targetSdk = 30
+    targetSdk = 34
 }
 
 android {
@@ -16,12 +16,12 @@ android {
     }
 
     compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_1_8
-        targetCompatibility = JavaVersion.VERSION_1_8
+        sourceCompatibility = JavaVersion.VERSION_17
+        targetCompatibility = JavaVersion.VERSION_17
     }
 
     kotlinOptions {
-        jvmTarget = JavaVersion.VERSION_1_8.toString()
+        jvmTarget = JavaVersion.VERSION_17.toString()
     }
 
     buildFeatures {
diff --git a/kotlin-extensions/build.gradle b/kotlin-extensions/build.gradle
index afbabac..77d4e06 100644
--- a/kotlin-extensions/build.gradle
+++ b/kotlin-extensions/build.gradle
@@ -1,5 +1,9 @@
 apply from: "../android-configs/lib-config.gradle"
 
+android {
+    namespace = "ru.touchin.extensions"
+}
+
 dependencies {
     implementation "androidx.recyclerview:recyclerview"
     implementation "androidx.fragment:fragment-ktx"
diff --git a/logging/build.gradle b/logging/build.gradle
index 57d4392..4705cb8 100644
--- a/logging/build.gradle
+++ b/logging/build.gradle
@@ -1,5 +1,9 @@
 apply from: "../android-configs/lib-config.gradle"
 
+android {
+    namespace = "ru.touchin.roboswag.core.log"
+}
+
 dependencies {
     implementation "androidx.annotation:annotation"
 
diff --git a/recyclerview-decorators/build.gradle b/recyclerview-decorators/build.gradle
index 6b6633f..cc05549 100644
--- a/recyclerview-decorators/build.gradle
+++ b/recyclerview-decorators/build.gradle
@@ -1,6 +1,10 @@
 apply from: "../android-configs/lib-config.gradle"
 apply plugin: 'kotlin-android'
 
+android {
+    namespace = "ru.touchin.roboswag.recyclerview_decorators"
+}
+
 dependencies {
     implementation project(":utils")
     implementation project(":kotlin-extensions")
diff --git a/utils/build.gradle b/utils/build.gradle
index 513c848..86d6e8e 100644
--- a/utils/build.gradle
+++ b/utils/build.gradle
@@ -1,5 +1,9 @@
 apply from: "../android-configs/lib-config.gradle"
 
+android {
+    namespace = "ru.touchin.roboswag.core.utils"
+}
+
 dependencies {
     def coreVersion = '1.0.0'
     def annotationVersion = '1.1.0'
-- 
2.40.1


From 14f2d637aa4142ecb9678eb353f7b2cc9c2000b5 Mon Sep 17 00:00:00 2001
From: Bogdan Terehov <bogdan.terehov>
Date: Wed, 1 May 2024 18:38:51 +0300
Subject: [PATCH 2/2] fix add namespace to yandex-map and base-map

---
 base-map/build.gradle                   | 4 ++++
 base-map/src/main/AndroidManifest.xml   | 2 +-
 yandex-map/build.gradle                 | 4 ++++
 yandex-map/src/main/AndroidManifest.xml | 2 +-
 4 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/base-map/build.gradle b/base-map/build.gradle
index abacdd7..e8601ca 100644
--- a/base-map/build.gradle
+++ b/base-map/build.gradle
@@ -1 +1,5 @@
 apply from: "../android-configs/lib-config.gradle"
+
+android {
+    namespace = "ru.touchin.basemap"
+}
diff --git a/base-map/src/main/AndroidManifest.xml b/base-map/src/main/AndroidManifest.xml
index e75761d..cc947c5 100644
--- a/base-map/src/main/AndroidManifest.xml
+++ b/base-map/src/main/AndroidManifest.xml
@@ -1 +1 @@
-<manifest package="ru.touchin.basemap"/>
+<manifest />
diff --git a/yandex-map/build.gradle b/yandex-map/build.gradle
index 3a4eac7..dc99e19 100644
--- a/yandex-map/build.gradle
+++ b/yandex-map/build.gradle
@@ -13,3 +13,7 @@ dependencies {
         }
     }
 }
+
+android {
+    namespace = "ru.touchin.yandexmap"
+}
diff --git a/yandex-map/src/main/AndroidManifest.xml b/yandex-map/src/main/AndroidManifest.xml
index e02442d..cc947c5 100644
--- a/yandex-map/src/main/AndroidManifest.xml
+++ b/yandex-map/src/main/AndroidManifest.xml
@@ -1 +1 @@
-<manifest package="ru.touchin.yandexmap"/>
+<manifest />
-- 
2.40.1