From f4ae68b184602b13be0ae84081e8b3b2224f9ae6 Mon Sep 17 00:00:00 2001
From: roman_tcaregorodtcev <roman.tc@omega-r.com>
Date: Fri, 19 Jan 2018 10:56:24 +0300
Subject: [PATCH] manifest merge bug was fixed

---
 .idea/misc.xml                                 | 12 +-----------
 .idea/modules.xml                              |  3 +++
 app/build.gradle                               | 10 +++++-----
 build.gradle                                   |  8 +++++++-
 gradle/wrapper/gradle-wrapper.properties       |  4 ++--
 shadowframelayout/build.gradle                 | 11 ++++++-----
 shadowframelayout/src/main/AndroidManifest.xml | 14 +-------------
 7 files changed, 25 insertions(+), 37 deletions(-)

diff --git a/.idea/misc.xml b/.idea/misc.xml
index 75318f7..85e20f2 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -43,17 +43,7 @@
       </profile-state>
     </entry>
   </component>
-  <component name="ProjectLevelVcsManager" settingsEditedManually="false">
-    <OptionsSetting value="true" id="Add" />
-    <OptionsSetting value="true" id="Remove" />
-    <OptionsSetting value="true" id="Checkout" />
-    <OptionsSetting value="true" id="Update" />
-    <OptionsSetting value="true" id="Status" />
-    <OptionsSetting value="true" id="Edit" />
-    <ConfirmationsSetting value="0" id="Add" />
-    <ConfirmationsSetting value="0" id="Remove" />
-  </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" default="true" assert-keyword="true" jdk-15="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" default="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">
diff --git a/.idea/modules.xml b/.idea/modules.xml
index b1fbd1b..74fdc8d 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -2,8 +2,11 @@
 <project version="4">
   <component name="ProjectModuleManager">
     <modules>
+      <module fileurl="file://$PROJECT_DIR$/.idea/ShadowFrameLayout.iml" filepath="$PROJECT_DIR$/.idea/ShadowFrameLayout.iml" />
       <module fileurl="file://$PROJECT_DIR$/ShadowFrameLayoutExample.iml" filepath="$PROJECT_DIR$/ShadowFrameLayoutExample.iml" />
       <module fileurl="file://$PROJECT_DIR$/app/app.iml" filepath="$PROJECT_DIR$/app/app.iml" />
+      <module fileurl="file://$PROJECT_DIR$/app/app.iml" filepath="$PROJECT_DIR$/app/app.iml" />
+      <module fileurl="file://$PROJECT_DIR$/shadowframelayout/shadowframelayout.iml" filepath="$PROJECT_DIR$/shadowframelayout/shadowframelayout.iml" />
       <module fileurl="file://$PROJECT_DIR$/shadowframelayout/shadowframelayout.iml" filepath="$PROJECT_DIR$/shadowframelayout/shadowframelayout.iml" />
     </modules>
   </component>
diff --git a/app/build.gradle b/app/build.gradle
index c3a5472..39861fc 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -1,12 +1,12 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 25
-    buildToolsVersion "26.0.0"
+    compileSdkVersion rootProject.ext.compileSdkVersion
+    buildToolsVersion rootProject.ext.supportVersion
     defaultConfig {
         applicationId "r12.shadowframelayoutexample"
-        minSdkVersion 9
-        targetSdkVersion 25
+        minSdkVersion 14
+        targetSdkVersion rootProject.ext.targetSdkVersion
         versionCode 1
         versionName "1.0"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
@@ -24,7 +24,7 @@ dependencies {
     androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', {
         exclude group: 'com.android.support', module: 'support-annotations'
     })
-    compile 'com.android.support:appcompat-v7:25.3.1'
+    compile "com.android.support:appcompat-v7:$supportVersion"
     compile 'com.android.support.constraint:constraint-layout:1.0.2'
     compile project(':shadowframelayout')
     testCompile 'junit:junit:4.12'
diff --git a/build.gradle b/build.gradle
index 1be9f26..34b0e68 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,11 +1,16 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 buildscript {
+    ext.supportVersion = '27.0.2'
+    ext.compileSdkVersion = 27
+    ext.targetSdkVersion = 27
+
     repositories {
         jcenter()
+        google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.3.3'
+        classpath 'com.android.tools.build:gradle:3.0.1'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
@@ -16,6 +21,7 @@ allprojects {
     repositories {
         jcenter()
         maven { url 'https://jitpack.io' }
+        google()
     }
 }
 
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 2662944..be7169a 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Sat Jun 17 18:34:56 MSK 2017
+#Fri Jan 19 10:49:16 MSK 2018
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip
diff --git a/shadowframelayout/build.gradle b/shadowframelayout/build.gradle
index 55be5f0..6fec915 100644
--- a/shadowframelayout/build.gradle
+++ b/shadowframelayout/build.gradle
@@ -1,12 +1,13 @@
 apply plugin: 'com.android.library'
 
 android {
-    compileSdkVersion 25
-    buildToolsVersion "26.0.0"
+
+    compileSdkVersion rootProject.ext.compileSdkVersion
+    buildToolsVersion rootProject.ext.supportVersion
 
     defaultConfig {
-        minSdkVersion 9
-        targetSdkVersion 25
+        minSdkVersion 14
+        targetSdkVersion rootProject.ext.targetSdkVersion
         versionCode 2
         versionName "1.0"
 
@@ -26,6 +27,6 @@ dependencies {
     androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', {
         exclude group: 'com.android.support', module: 'support-annotations'
     })
-    compile 'com.android.support:appcompat-v7:25.3.1'
+    implementation 'com.android.support:appcompat-v7:27.0.2'
     testCompile 'junit:junit:4.12'
 }
diff --git a/shadowframelayout/src/main/AndroidManifest.xml b/shadowframelayout/src/main/AndroidManifest.xml
index cd9eaba..a710e16 100644
--- a/shadowframelayout/src/main/AndroidManifest.xml
+++ b/shadowframelayout/src/main/AndroidManifest.xml
@@ -1,13 +1 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-
-          package="r12.shadowframelayout"
->
-
-    <application android:allowBackup="true"
-                 android:label="@string/app_name"
-                 android:supportsRtl="true"
-    >
-
-    </application>
-
-</manifest>
+<manifest package="r12.shadowframelayout"/>