Skip to content

Commit e2c6e79

Browse files
committed
Merge pull request #23 from tkirshboim/master
Updated tools, replaced maven central with jcenter
2 parents 83dbec5 + b6c21f7 commit e2c6e79

File tree

9 files changed

+9
-18
lines changed

9 files changed

+9
-18
lines changed

CircleOfFifths/build.gradle

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
apply plugin: 'com.android.application'
22

33
dependencies {
4-
compile fileTree(dir: 'libs', include: '*.jar')
54
compile project(':PdCore')
65
}
76

PdCore/build.gradle

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
apply plugin: 'com.android.library'
22

33
dependencies {
4-
compile fileTree(dir: 'libs', include: '*.jar')
54
compile 'com.github.nettoyeurny:btmidi:9bc54ccbe1'
65
compile 'com.android.support:support-v4:23.1.0'
76
}

PdTest/build.gradle

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
apply plugin: 'com.android.application'
22

33
dependencies {
4-
compile fileTree(dir: 'libs', include: '*.jar')
54
compile project(':PdCore')
65
}
76

ScenePlayer/build.gradle

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
apply plugin: 'com.android.application'
22

33
dependencies {
4-
compile fileTree(dir: 'libs', include: '*.jar')
54
compile project(':PdCore')
65
}
76

Voice-O-Rama/build.gradle

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
apply plugin: 'com.android.application'
22

33
dependencies {
4-
compile fileTree(dir: 'libs', include: '*.jar')
54
compile project(':PdCore')
65
}
76

build.gradle

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
11
buildscript {
22
repositories {
3-
mavenCentral()
3+
jcenter()
44
}
55
dependencies {
6-
classpath 'com.android.tools.build:gradle:1.3.1'
6+
classpath 'com.android.tools.build:gradle:1.5.0'
77
}
88
}
99

1010
allprojects {
1111
repositories {
12-
mavenCentral()
12+
jcenter()
1313
maven { url "https://jitpack.io" }
1414
}
1515
}
1616

1717
// Gradle wrapper task
1818
task wrapper(type: Wrapper) {
19-
gradleVersion = '2.8'
19+
gradleVersion = '2.9'
2020
}

gradle/wrapper/gradle-wrapper.jar

1.34 KB
Binary file not shown.
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
#Sun Nov 01 22:52:37 PST 2015
1+
#Thu Nov 19 18:21:37 CET 2015
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.8-bin.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-2.9-bin.zip

gradlew

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -42,11 +42,6 @@ case "`uname`" in
4242
;;
4343
esac
4444

45-
# For Cygwin, ensure paths are in UNIX format before anything is touched.
46-
if $cygwin ; then
47-
[ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
48-
fi
49-
5045
# Attempt to set APP_HOME
5146
# Resolve links: $0 may be a link
5247
PRG="$0"
@@ -61,9 +56,9 @@ while [ -h "$PRG" ] ; do
6156
fi
6257
done
6358
SAVED="`pwd`"
64-
cd "`dirname \"$PRG\"`/" >&-
59+
cd "`dirname \"$PRG\"`/" >/dev/null
6560
APP_HOME="`pwd -P`"
66-
cd "$SAVED" >&-
61+
cd "$SAVED" >/dev/null
6762

6863
CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
6964

@@ -114,6 +109,7 @@ fi
114109
if $cygwin ; then
115110
APP_HOME=`cygpath --path --mixed "$APP_HOME"`
116111
CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
112+
JAVACMD=`cygpath --unix "$JAVACMD"`
117113

118114
# We build the pattern for arguments to be converted via cygpath
119115
ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`

0 commit comments

Comments
 (0)