Removed unnessecary elements from library manifest and changed support library dependancy from compile to provided to avoid conflicts. Solves issue stealthcopter#5

stealthcopter · stealthcopter · commit ae00a3c42bbe · 2016-12-09T12:08:20.000Z
diff --git a/.idea/.name b/.idea/.name
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
diff --git a/app/build.gradle b/app/build.gradle
@@ -8,8 +8,8 @@ android {
     applicationId "com.stealthcotper.networktools"
     minSdkVersion 14
     targetSdkVersion 24
-    versionCode 3
-    versionName "0.1.04"
+    versionCode 4
+    versionName "0.1.05"
   }
   buildTypes {
     release {
diff --git a/build.gradle b/build.gradle
@@ -5,7 +5,7 @@ buildscript {
     jcenter()
   }
   dependencies {
-    classpath 'com.android.tools.build:gradle:2.1.2'
+    classpath 'com.android.tools.build:gradle:2.2.2'
 
     // NOTE: Do not place your application dependencies here; they belong
     // in the individual module build.gradle files
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Thu Aug 25 13:56:45 BST 2016
+#Fri Dec 09 11:58:50 GMT 2016
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.10-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip
diff --git a/library/build.gradle b/library/build.gradle
@@ -7,8 +7,8 @@ android {
   defaultConfig {
     minSdkVersion 14
     targetSdkVersion 24
-    versionCode 1
-    versionName "0.1.2"
+    versionCode 2
+    versionName "0.1.3"
   }
   buildTypes {
     release {
@@ -22,5 +22,5 @@ dependencies {
   compile fileTree(dir: 'libs', include: ['*.jar'])
   testCompile 'junit:junit:4.12'
   testCompile 'org.mockito:mockito-core:1.9.5'
-  compile 'com.android.support:appcompat-v7:24.2.0'
+  provided 'com.android.support:appcompat-v7:24.2.0'
 }
diff --git a/library/src/main/AndroidManifest.xml b/library/src/main/AndroidManifest.xml
@@ -1,15 +1,5 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.stealthcopter.networktools"
-    >
-
-  <uses-permission android:name="android.permission.INTERNET" />
-
-  <application
-      android:allowBackup="true"
-      android:label="@string/app_name"
-      android:supportsRtl="true"
-      >
-
-  </application>
-
+    package="com.stealthcopter.networktools">
+    <uses-permission android:name="android.permission.INTERNET" />
+    <application />
 </manifest>

Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@ buildscript {`
`5`	`5`	`jcenter()`
`6`	`6`	`}`
`7`	`7`	`dependencies {`
`8`		`- classpath 'com.android.tools.build:gradle:2.1.2'`
	`8`	`+ classpath 'com.android.tools.build:gradle:2.2.2'`
`9`	`9`
`10`	`10`	`// NOTE: Do not place your application dependencies here; they belong`
`11`	`11`	`// in the individual module build.gradle files`