Skip to content
This repository was archived by the owner on Oct 3, 2024. It is now read-only.

Commit f54dd20

Browse files
SUPERCILEXsamtstern
authored andcommitted
Update deps and gradle (#73)
1 parent 248d8f7 commit f54dd20

File tree

9 files changed

+31
-28
lines changed

9 files changed

+31
-28
lines changed

.gitignore

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
# Gradle files
2-
.gradle/
3-
build/
2+
.gradle
3+
build
44

55
# Local configuration file (sdk path, etc)
66
local.properties
77

88
# IntelliJ project files
9-
*.iml
10-
.idea/
9+
**.iml
10+
.idea
1111

1212
# Android Studio captures folder
1313
captures/

.travis.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,13 @@ cache:
88
directories:
99
- $HOME/.gradle/caches/
1010
- $HOME/.gradle/wrapper/
11+
- $HOME/.android/build-cache
1112

1213
android:
1314
components:
1415
- tools
1516
- platform-tools
16-
- build-tools-25.0.0
17+
- build-tools-25.0.2
1718
- android-25
1819
- extra-android-m2repository
1920

app/build.gradle

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ android {
1111
versionCode 1
1212
versionName "1.0"
1313
}
14+
1415
buildTypes {
1516
release {
1617
minifyEnabled false
@@ -20,7 +21,7 @@ android {
2021
}
2122

2223
dependencies {
23-
compile "com.android.support:appcompat-v7:${support_library_version}"
24+
compile "com.android.support:appcompat-v7:$support_library_version"
2425

2526
compile project(':easypermissions')
2627
}

build.gradle

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,13 @@
1-
// Top-level build file where you can add configuration options common to all sub-projects/modules.
2-
31
buildscript {
42
repositories {
53
jcenter()
64
}
5+
76
dependencies {
8-
classpath 'com.android.tools.build:gradle:2.2.2'
7+
classpath 'com.android.tools.build:gradle:2.3.0-beta2'
98

109
classpath 'com.github.dcendents:android-maven-gradle-plugin:1.5'
11-
classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.7.1'
10+
classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.7.3'
1211
}
1312
}
1413

@@ -34,9 +33,9 @@ ext {
3433

3534
bintrayOrg = 'easygoogle'
3635

37-
support_library_version = '25.0.0'
36+
support_library_version = '25.1.0'
3837

39-
buildTools = '25.0.0'
38+
buildTools = '25.0.2'
4039
compileSdk = 25
4140
targetSdk = 25
4241
}

easypermissions/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ android {
2424
}
2525

2626
dependencies {
27-
compile "com.android.support:appcompat-v7:${support_library_version}"
27+
compile "com.android.support:appcompat-v7:$support_library_version"
2828
}
2929

3030
apply from: 'maven.gradle'

gradle/wrapper/gradle-wrapper.jar

884 Bytes
Binary file not shown.
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
#Wed Sep 14 15:23:50 SGT 2016
1+
#Tue Jan 17 19:09:58 PST 2017
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-3.1-all.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip

gradlew

Lines changed: 15 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#!/usr/bin/env bash
1+
#!/usr/bin/env sh
22

33
##############################################################################
44
##
@@ -154,11 +154,19 @@ if $cygwin ; then
154154
esac
155155
fi
156156

157-
# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules
158-
function splitJvmOpts() {
159-
JVM_OPTS=("$@")
157+
# Escape application args
158+
save ( ) {
159+
for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
160+
echo " "
160161
}
161-
eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
162-
JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"
162+
APP_ARGS=$(save "$@")
163163

164-
exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"
164+
# Collect all arguments for the java command, following the shell quoting and substitution rules
165+
eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
166+
167+
# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
168+
if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
169+
cd "$(dirname "$0")"
170+
fi
171+
172+
exec "$JAVACMD" "$@"

gradlew.bat

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,6 @@ goto fail
4949
@rem Get command-line arguments, handling Windows variants
5050

5151
if not "%OS%" == "Windows_NT" goto win9xME_args
52-
if "%@eval[2+2]" == "4" goto 4NT_args
5352

5453
:win9xME_args
5554
@rem Slurp the command line arguments.
@@ -60,11 +59,6 @@ set _SKIP=2
6059
if "x%~1" == "x" goto execute
6160

6261
set CMD_LINE_ARGS=%*
63-
goto execute
64-
65-
:4NT_args
66-
@rem Get arguments from the 4NT Shell from JP Software
67-
set CMD_LINE_ARGS=%$
6862

6963
:execute
7064
@rem Setup the command line

0 commit comments

Comments
 (0)