From caf17adadf2f6485d239a51f6db1cd994fb28e3c Mon Sep 17 00:00:00 2001
From: Krasimir Topchiyski <k_topchiyski@yahoo.com>
Date: Thu, 10 Nov 2022 21:39:28 +0200
Subject: [PATCH] Using git submodules for all dependencies and now only one
 repo is necessary to pull in order to build the APK.

---
 .gitmodules            | 12 ++++++++++++
 Android_APP_2DBalloons |  1 +
 Android_LIB_Commons    |  1 +
 Android_LIB_Commons2D  |  1 +
 Android_LIB_CommonsAds |  1 +
 app/build.gradle       | 12 +++---------
 settings.gradle        |  8 ++++----
 7 files changed, 23 insertions(+), 13 deletions(-)
 create mode 100644 .gitmodules
 create mode 160000 Android_APP_2DBalloons
 create mode 160000 Android_LIB_Commons
 create mode 160000 Android_LIB_Commons2D
 create mode 160000 Android_LIB_CommonsAds

diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 0000000..475a54d
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,12 @@
+[submodule "Android_LIB_Commons"]
+	path = Android_LIB_Commons
+	url = https://github.com/MetatransApps/Android_LIB_Commons
+[submodule "Android_LIB_CommonsAds"]
+	path = Android_LIB_CommonsAds
+	url = https://github.com/MetatransApps/Android_LIB_CommonsAds
+[submodule "Android_LIB_Commons2D"]
+	path = Android_LIB_Commons2D
+	url = https://github.com/MetatransApps/Android_LIB_Commons2D
+[submodule "Android_APP_2DBalloons"]
+	path = Android_APP_2DBalloons
+	url = https://github.com/MetatransApps/Android_APP_2DBalloons
diff --git a/Android_APP_2DBalloons b/Android_APP_2DBalloons
new file mode 160000
index 0000000..85552e8
--- /dev/null
+++ b/Android_APP_2DBalloons
@@ -0,0 +1 @@
+Subproject commit 85552e8a55c7e50564938666985570762f71c395
diff --git a/Android_LIB_Commons b/Android_LIB_Commons
new file mode 160000
index 0000000..5c90244
--- /dev/null
+++ b/Android_LIB_Commons
@@ -0,0 +1 @@
+Subproject commit 5c902441990fa585ad5df37dba5fab1bd58b72b5
diff --git a/Android_LIB_Commons2D b/Android_LIB_Commons2D
new file mode 160000
index 0000000..ac1940a
--- /dev/null
+++ b/Android_LIB_Commons2D
@@ -0,0 +1 @@
+Subproject commit ac1940a148d50c6c62b9a95da8b5be62b82a6409
diff --git a/Android_LIB_CommonsAds b/Android_LIB_CommonsAds
new file mode 160000
index 0000000..1028d6b
--- /dev/null
+++ b/Android_LIB_CommonsAds
@@ -0,0 +1 @@
+Subproject commit 1028d6b76d490ae840910b4ad36cb6c5f9370f57
diff --git a/app/build.gradle b/app/build.gradle
index 189f841..2a91c24 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -17,11 +17,14 @@ android {
     }
 
     buildTypes {
+
         release {
+
             minifyEnabled false
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
         }
     }
+
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_8
         targetCompatibility JavaVersion.VERSION_1_8
@@ -29,15 +32,6 @@ android {
 
     namespace 'com.stoptheballs'
 
-    android.applicationVariants.all { variant ->
-        variant.outputs.all {
-            println variant.name
-            if (variant.name.contains("release")) {
-                outputFileName = new File("../../../../../../release", "com.stoptheballs_${variant.versionCode}_ads_home.apk")
-                println outputFileName
-            }
-        }
-    }
 }
 
 dependencies {
diff --git a/settings.gradle b/settings.gradle
index 11e85f3..a370902 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -6,7 +6,7 @@ include ':Android_LIB_CommonsAds'
 include ':Android_LIB_Commons2D'
 include ':Android_APP_2DBalloons'
 
-project(':Android_LIB_Commons').projectDir = new File('./../Android_LIB_Commons/app')
-project(':Android_LIB_CommonsAds').projectDir = new File('./../Android_LIB_CommonsAds/app')
-project(':Android_LIB_Commons2D').projectDir = new File('./../Android_LIB_Commons2D/app')
-project(':Android_APP_2DBalloons').projectDir = new File('./../Android_APP_2DBalloons/app')
+project(':Android_LIB_Commons').projectDir = new File('./Android_LIB_Commons/app')
+project(':Android_LIB_CommonsAds').projectDir = new File('./Android_LIB_CommonsAds/app')
+project(':Android_LIB_Commons2D').projectDir = new File('./Android_LIB_Commons2D/app')
+project(':Android_APP_2DBalloons').projectDir = new File('./Android_APP_2DBalloons/app')