upgrade dependencies (gradle plugin 1.5.0, appcompat 23.1.1, build tools 23.0.2, gradle 2.9, android-maven plugin 1.3), remove unnecessary version definitions in manifest, auto generated wrapper files

barnhill · barnhill · commit 6b2bfddfda8a · 2015-11-19T22:06:47.000-06:00
diff --git a/MPChartExample/build.gradle b/MPChartExample/build.gradle
@@ -2,7 +2,7 @@ apply plugin: 'com.android.application'
 
 android {
     compileSdkVersion 23
-    buildToolsVersion '23.0.1'
+    buildToolsVersion '23.0.2'
     defaultConfig {
         minSdkVersion 8
         targetSdkVersion 23
@@ -38,7 +38,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:1.3.1'
+        classpath 'com.android.tools.build:gradle:1.5.0'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
@@ -52,6 +52,6 @@ repositories {
 dependencies {
     //compile fileTree(dir: 'libs', include: ['*.jar'])
     compile project(':MPChartLib') // remove this if you only imported the example project
-    compile 'com.android.support:appcompat-v7:23.0.0'
+    compile 'com.android.support:appcompat-v7:23.1.1'
     //compile 'com.github.PhilJay:MPAndroidChart:v2.1.1'
 }
diff --git a/MPChartLib/AndroidManifest.xml b/MPChartLib/AndroidManifest.xml
@@ -1,12 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.github.mikephil.charting"
-    android:versionCode="1"
-    android:versionName="1.0" >
-
-    <uses-sdk
-        android:minSdkVersion="8"
-        android:targetSdkVersion="22" />
+<manifest package="com.github.mikephil.charting">
 
  <!--  <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
 
diff --git a/MPChartLib/build.gradle b/MPChartLib/build.gradle
@@ -1,9 +1,10 @@
 apply plugin: 'com.android.library'
-apply plugin: 'android-maven'
+apply plugin: 'maven'
+apply plugin: 'com.github.dcendents.android-maven'
 
 android {
     compileSdkVersion 23
-    buildToolsVersion '23.0.1'
+    buildToolsVersion '23.0.2'
     // resourcePrefix 'mpcht'
     defaultConfig {
         minSdkVersion 8
diff --git a/build.gradle b/build.gradle
@@ -1,10 +1,14 @@
+task wrapper(type: Wrapper) {
+    gradleVersion = '2.9'
+}
+
 buildscript {
     repositories {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:1.3.1'
-        classpath 'com.github.dcendents:android-maven-plugin:1.2'
+        classpath 'com.android.tools.build:gradle:1.5.0'
+        classpath 'com.github.dcendents:android-maven-gradle-plugin:1.3'
     }
 }
 
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Sun Jan 11 01:47:43 CST 2015
+#Thu Nov 19 21:53:09 CST 2015
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.2.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.9-bin.zip
diff --git a/gradlew b/gradlew

Original file line number	Diff line number	Diff line change
`@@ -1,10 +1,14 @@`
	`1`	`+task wrapper(type: Wrapper) {`
	`2`	`+ gradleVersion = '2.9'`
	`3`	`+}`
	`4`	`+`
`1`	`5`	`buildscript {`
`2`	`6`	`repositories {`
`3`	`7`	`jcenter()`
`4`	`8`	`}`
`5`	`9`	`dependencies {`
`6`		`- classpath 'com.android.tools.build:gradle:1.3.1'`
`7`		`- classpath 'com.github.dcendents:android-maven-plugin:1.2'`
	`10`	`+ classpath 'com.android.tools.build:gradle:1.5.0'`
	`11`	`+ classpath 'com.github.dcendents:android-maven-gradle-plugin:1.3'`
`8`	`12`	`}`
`9`	`13`	`}`
`10`	`14`