From 420dc973183e63be7e88ea51125a5aacc39d9aa2 Mon Sep 17 00:00:00 2001
From: Walter Huf <hufman@gmail.com>
Date: Thu, 24 Feb 2022 17:35:06 -0800
Subject: [PATCH] Switches to using submodules for IDriveConnectKit/Android
 libraries

---
 .gitmodules             |  6 ++++++
 IDriveConnectKit        |  1 +
 IDriveConnectKitAndroid |  1 +
 app/build.gradle        | 10 +++++-----
 build.gradle            |  2 +-
 settings.gradle         |  4 +++-
 6 files changed, 17 insertions(+), 7 deletions(-)
 create mode 100644 .gitmodules
 create mode 160000 IDriveConnectKit
 create mode 160000 IDriveConnectKitAndroid

diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 000000000..2d29f7439
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,6 @@
+[submodule "IDriveConnectKit"]
+	path = IDriveConnectKit
+	url = https://github.com/BimmerGestalt/IDriveConnectKit.git
+[submodule "IDriveConnectKitAndroid"]
+	path = IDriveConnectKitAndroid
+	url = https://github.com/BimmerGestalt/IDriveConnectKitAndroid.git
diff --git a/IDriveConnectKit b/IDriveConnectKit
new file mode 160000
index 000000000..de3f7a522
--- /dev/null
+++ b/IDriveConnectKit
@@ -0,0 +1 @@
+Subproject commit de3f7a522b2832dccdba5a1f3fa784c7993f561d
diff --git a/IDriveConnectKitAndroid b/IDriveConnectKitAndroid
new file mode 160000
index 000000000..84ef0a391
--- /dev/null
+++ b/IDriveConnectKitAndroid
@@ -0,0 +1 @@
+Subproject commit 84ef0a391f05d221c0793955ba09c26a04fd83c8
diff --git a/app/build.gradle b/app/build.gradle
index 1e6056881..76446b4e9 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -310,11 +310,11 @@ dependencies {
     androidTestImplementation 'com.github.tmurakami:dexopener:2.0.5'
     androidTestImplementation 'org.awaitility:awaitility-scala:3.1.5'
 
-    implementation 'io.bimmergestalt.idriveconnectkit:idriveconnectkit:0.7'
-    implementation 'io.bimmergestalt:IDriveConnectKitAndroid:0.7'
-    testImplementation 'io.bimmergestalt.idriveconnectkit:idriveconnectkit:0.7'
-    androidTestImplementation 'io.bimmergestalt.idriveconnectkit:idriveconnectkit:0.7'
-    androidTestImplementation 'io.bimmergestalt:IDriveConnectKitAndroid:0.7'
+    implementation 'io.bimmergestalt.idriveconnectkit:idriveconnectkit'
+    implementation 'io.bimmergestalt:IDriveConnectKitAndroid'
+    testImplementation 'io.bimmergestalt.idriveconnectkit:idriveconnectkit'
+    androidTestImplementation 'io.bimmergestalt.idriveconnectkit:idriveconnectkit'
+    androidTestImplementation 'io.bimmergestalt:IDriveConnectKitAndroid'
     androidTestImplementation "org.bouncycastle:bcmail-jdk16:1.46"
     testImplementation "org.jetbrains.kotlinx:kotlinx-coroutines-test:$kotlin_coroutines_version"
     testImplementation "org.powermock:powermock-core:2.0.9"
diff --git a/build.gradle b/build.gradle
index 8973ead17..d279c437b 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,7 +1,7 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 buildscript {
-    ext.kotlin_version = '1.9.0'
+    ext.kotlin_version = '1.9.20'
     ext.kotlin_coroutines_version = '1.6.0'
     ext.androidx_lifecycle_extensions_version = '2.2.0'
     ext.androidx_navigation_version = '2.7.7'
diff --git a/settings.gradle b/settings.gradle
index 4405333f9..8b7f06265 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1 +1,3 @@
-include ':app', ':spotify-app-remote'
\ No newline at end of file
+include ':app', ':spotify-app-remote'
+includeBuild 'IDriveConnectKit'
+includeBuild 'IDriveConnectKitAndroid'
\ No newline at end of file