Skip to content

Commit ae00a3c

Browse files
committedDec 9, 2016
Removed unnessecary elements from library manifest and changed support library dependancy from compile to provided to avoid conflicts. Solves issue #5
1 parent 9109ea8 commit ae00a3c

File tree

7 files changed

+12
-29
lines changed

7 files changed

+12
-29
lines changed
 

‎.idea/.name

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎.idea/gradle.xml

Lines changed: 1 addition & 7 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎app/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ android {
88
applicationId "com.stealthcotper.networktools"
99
minSdkVersion 14
1010
targetSdkVersion 24
11-
versionCode 3
12-
versionName "0.1.04"
11+
versionCode 4
12+
versionName "0.1.05"
1313
}
1414
buildTypes {
1515
release {

‎build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ buildscript {
55
jcenter()
66
}
77
dependencies {
8-
classpath 'com.android.tools.build:gradle:2.1.2'
8+
classpath 'com.android.tools.build:gradle:2.2.2'
99

1010
// NOTE: Do not place your application dependencies here; they belong
1111
// in the individual module build.gradle files
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
#Thu Aug 25 13:56:45 BST 2016
1+
#Fri Dec 09 11:58:50 GMT 2016
22
distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-2.10-all.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip

‎library/build.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ android {
77
defaultConfig {
88
minSdkVersion 14
99
targetSdkVersion 24
10-
versionCode 1
11-
versionName "0.1.2"
10+
versionCode 2
11+
versionName "0.1.3"
1212
}
1313
buildTypes {
1414
release {
@@ -22,5 +22,5 @@ dependencies {
2222
compile fileTree(dir: 'libs', include: ['*.jar'])
2323
testCompile 'junit:junit:4.12'
2424
testCompile 'org.mockito:mockito-core:1.9.5'
25-
compile 'com.android.support:appcompat-v7:24.2.0'
25+
provided 'com.android.support:appcompat-v7:24.2.0'
2626
}

‎library/src/main/AndroidManifest.xml

Lines changed: 3 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,5 @@
11
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
2-
package="com.stealthcopter.networktools"
3-
>
4-
5-
<uses-permission android:name="android.permission.INTERNET" />
6-
7-
<application
8-
android:allowBackup="true"
9-
android:label="@string/app_name"
10-
android:supportsRtl="true"
11-
>
12-
13-
</application>
14-
2+
package="com.stealthcopter.networktools">
3+
<uses-permission android:name="android.permission.INTERNET" />
4+
<application />
155
</manifest>

0 commit comments

Comments
 (0)