From d6db47b6905c4a3da521ed6d1606d5e45b955224 Mon Sep 17 00:00:00 2001
From: vokod <vokoda@gmail.com>
Date: Thu, 14 Feb 2019 15:17:58 +0100
Subject: [PATCH] removed product flavors

---
 demo/build.gradle                                     |  8 --------
 settingsviews/build.gradle                            |  9 ---------
 settingsviews/src/main/AndroidManifest.xml            |  3 +++
 .../java/com/awolity/settingsviews}/MockActivity.kt   |  0
 .../src/{mock => main}/res/layout/activity_mock.xml   |  0
 settingsviews/src/mock/AndroidManifest.xml            | 11 -----------
 settingsviews/src/mock/res/values/strings.xml         |  6 ------
 7 files changed, 3 insertions(+), 34 deletions(-)
 rename settingsviews/src/{mock/java/com/awolity/setingsviews => main/java/com/awolity/settingsviews}/MockActivity.kt (100%)
 rename settingsviews/src/{mock => main}/res/layout/activity_mock.xml (100%)
 delete mode 100644 settingsviews/src/mock/AndroidManifest.xml
 delete mode 100644 settingsviews/src/mock/res/values/strings.xml

diff --git a/demo/build.gradle b/demo/build.gradle
index 8bf80b5..f6db09e 100644
--- a/demo/build.gradle
+++ b/demo/build.gradle
@@ -20,14 +20,6 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
         }
     }
-
-    flavorDimensions "env"
-
-    productFlavors {
-        mock {}
-        prod {}
-    }
-
 }
 
 dependencies {
diff --git a/settingsviews/build.gradle b/settingsviews/build.gradle
index ea857e1..00fe657 100644
--- a/settingsviews/build.gradle
+++ b/settingsviews/build.gradle
@@ -21,15 +21,6 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
         }
     }
-
-    flavorDimensions "env"
-
-    productFlavors {
-        mock {}
-        prod {}
-    }
-
-    defaultPublishConfig "prodRelease"
 }
 
 dependencies {
diff --git a/settingsviews/src/main/AndroidManifest.xml b/settingsviews/src/main/AndroidManifest.xml
index 1fc7400..84f3dad 100644
--- a/settingsviews/src/main/AndroidManifest.xml
+++ b/settingsviews/src/main/AndroidManifest.xml
@@ -3,6 +3,9 @@
           package="com.awolity.settingsviews">
 
     <application>
+        <activity android:name="com.awolity.setingsviews.MockActivity"
+                  android:theme="@style/AppTheme" >
+        </activity>
     </application>
 
 </manifest>
\ No newline at end of file
diff --git a/settingsviews/src/mock/java/com/awolity/setingsviews/MockActivity.kt b/settingsviews/src/main/java/com/awolity/settingsviews/MockActivity.kt
similarity index 100%
rename from settingsviews/src/mock/java/com/awolity/setingsviews/MockActivity.kt
rename to settingsviews/src/main/java/com/awolity/settingsviews/MockActivity.kt
diff --git a/settingsviews/src/mock/res/layout/activity_mock.xml b/settingsviews/src/main/res/layout/activity_mock.xml
similarity index 100%
rename from settingsviews/src/mock/res/layout/activity_mock.xml
rename to settingsviews/src/main/res/layout/activity_mock.xml
diff --git a/settingsviews/src/mock/AndroidManifest.xml b/settingsviews/src/mock/AndroidManifest.xml
deleted file mode 100644
index 84f3dad..0000000
--- a/settingsviews/src/mock/AndroidManifest.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-          package="com.awolity.settingsviews">
-
-    <application>
-        <activity android:name="com.awolity.setingsviews.MockActivity"
-                  android:theme="@style/AppTheme" >
-        </activity>
-    </application>
-
-</manifest>
\ No newline at end of file
diff --git a/settingsviews/src/mock/res/values/strings.xml b/settingsviews/src/mock/res/values/strings.xml
deleted file mode 100644
index f88b359..0000000
--- a/settingsviews/src/mock/res/values/strings.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<resources>
-    <string name="test_title">Title text</string>
-    <string name="test_description">Description text, a little longer, can be multiple lines, lorem ipsum dolor sit amet
-        sálálálá
-    </string>
-</resources>