Merge pull request #23 from tkirshboim/master

joebowbeer · joebowbeer · commit e2c6e7986da9 · 2015-11-19T09:49:57.000-08:00
Updated tools, replaced maven central with jcenter
diff --git a/CircleOfFifths/build.gradle b/CircleOfFifths/build.gradle
@@ -1,7 +1,6 @@
 apply plugin: 'com.android.application'
 
 dependencies {
-    compile fileTree(dir: 'libs', include: '*.jar')
     compile project(':PdCore')
 }
 
diff --git a/PdCore/build.gradle b/PdCore/build.gradle
@@ -1,7 +1,6 @@
 apply plugin: 'com.android.library'
 
 dependencies {
-    compile fileTree(dir: 'libs', include: '*.jar')
     compile 'com.github.nettoyeurny:btmidi:9bc54ccbe1'
     compile 'com.android.support:support-v4:23.1.0'
 }
diff --git a/PdTest/build.gradle b/PdTest/build.gradle
@@ -1,7 +1,6 @@
 apply plugin: 'com.android.application'
 
 dependencies {
-    compile fileTree(dir: 'libs', include: '*.jar')
     compile project(':PdCore')
 }
 
diff --git a/ScenePlayer/build.gradle b/ScenePlayer/build.gradle
@@ -1,7 +1,6 @@
 apply plugin: 'com.android.application'
 
 dependencies {
-    compile fileTree(dir: 'libs', include: '*.jar')
     compile project(':PdCore')
 }
 
diff --git a/Voice-O-Rama/build.gradle b/Voice-O-Rama/build.gradle
@@ -1,7 +1,6 @@
 apply plugin: 'com.android.application'
 
 dependencies {
-    compile fileTree(dir: 'libs', include: '*.jar')
     compile project(':PdCore')
 }
 
diff --git a/build.gradle b/build.gradle
@@ -1,20 +1,20 @@
 buildscript {
     repositories {
-        mavenCentral()
+        jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:1.3.1'
+        classpath 'com.android.tools.build:gradle:1.5.0'
     }
 }
 
 allprojects {
     repositories {
-        mavenCentral()
+        jcenter()
         maven { url "https://jitpack.io" }
     }
 }
 
 // Gradle wrapper task
 task wrapper(type: Wrapper) {
-    gradleVersion = '2.8'
+    gradleVersion = '2.9'
 }
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 Nov 01 22:52:37 PST 2015
+#Thu Nov 19 18:21:37 CET 2015
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.8-bin.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,7 +1,6 @@`
`1`	`1`	`apply plugin: 'com.android.application'`
`2`	`2`
`3`	`3`	`dependencies {`
`4`		`- compile fileTree(dir: 'libs', include: '*.jar')`
`5`	`4`	`compile project(':PdCore')`
`6`	`5`	`}`
`7`	`6`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,6 @@`
`1`	`1`	`apply plugin: 'com.android.library'`
`2`	`2`
`3`	`3`	`dependencies {`
`4`		`- compile fileTree(dir: 'libs', include: '*.jar')`
`5`	`4`	`compile 'com.github.nettoyeurny:btmidi:9bc54ccbe1'`
`6`	`5`	`compile 'com.android.support:support-v4:23.1.0'`
`7`	`6`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,20 +1,20 @@`
`1`	`1`	`buildscript {`
`2`	`2`	`repositories {`
`3`		`- mavenCentral()`
	`3`	`+ jcenter()`
`4`	`4`	`}`
`5`	`5`	`dependencies {`
`6`		`- classpath 'com.android.tools.build:gradle:1.3.1'`
	`6`	`+ classpath 'com.android.tools.build:gradle:1.5.0'`
`7`	`7`	`}`
`8`	`8`	`}`
`9`	`9`
`10`	`10`	`allprojects {`
`11`	`11`	`repositories {`
`12`		`- mavenCentral()`
	`12`	`+ jcenter()`
`13`	`13`	`maven { url "https://jitpack.io" }`
`14`	`14`	`}`
`15`	`15`	`}`
`16`	`16`
`17`	`17`	`// Gradle wrapper task`
`18`	`18`	`task wrapper(type: Wrapper) {`
`19`		`- gradleVersion = '2.8'`
	`19`	`+ gradleVersion = '2.9'`
`20`	`20`	`}`