Skip to content

Commit d5b2b9a

Browse files
Updated gradle to latest.
1 parent 74a9b0d commit d5b2b9a

File tree

9 files changed

+90
-87
lines changed

9 files changed

+90
-87
lines changed

build.gradle

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
buildscript {
22
repositories {
3-
mavenCentral()
3+
jcenter()
4+
google()
45
}
56

67
dependencies {
7-
classpath "com.android.tools.build:gradle:0.7.+"
8+
classpath 'com.android.tools.build:gradle:3.1.1'
89
}
910
}
1011

@@ -13,6 +14,7 @@ allprojects {
1314
group = GROUP
1415

1516
repositories {
16-
mavenCentral()
17+
google()
18+
jcenter()
1719
}
1820
}

gradle.properties

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,3 +12,5 @@ POM_LICENCE_URL=http://www.apache.org/licenses/LICENSE-2.0.txt
1212
POM_LICENCE_DIST=repo
1313
POM_DEVELOPER_ID=jgilfelt
1414
POM_DEVELOPER_NAME=Jeff Gilfelt
15+
org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
16+
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
#Wed Apr 10 15:27:10 PDT 2013
1+
#Mon Apr 16 13:02:10 CEST 2018
22
distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=http\://services.gradle.org/distributions/gradle-1.9-all.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip

gradlew

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

33
##############################################################################
44
##
55
## Gradle start up script for UN*X
66
##
77
##############################################################################
88

9-
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
10-
DEFAULT_JVM_OPTS=""
9+
# Attempt to set APP_HOME
10+
# Resolve links: $0 may be a link
11+
PRG="$0"
12+
# Need this for relative symlinks.
13+
while [ -h "$PRG" ] ; do
14+
ls=`ls -ld "$PRG"`
15+
link=`expr "$ls" : '.*-> \(.*\)$'`
16+
if expr "$link" : '/.*' > /dev/null; then
17+
PRG="$link"
18+
else
19+
PRG=`dirname "$PRG"`"/$link"
20+
fi
21+
done
22+
SAVED="`pwd`"
23+
cd "`dirname \"$PRG\"`/" >/dev/null
24+
APP_HOME="`pwd -P`"
25+
cd "$SAVED" >/dev/null
1126

1227
APP_NAME="Gradle"
1328
APP_BASE_NAME=`basename "$0"`
1429

30+
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
31+
DEFAULT_JVM_OPTS=""
32+
1533
# Use the maximum available, or set MAX_FD != -1 to use that value.
1634
MAX_FD="maximum"
1735

18-
warn ( ) {
36+
warn () {
1937
echo "$*"
2038
}
2139

22-
die ( ) {
40+
die () {
2341
echo
2442
echo "$*"
2543
echo
@@ -30,6 +48,7 @@ die ( ) {
3048
cygwin=false
3149
msys=false
3250
darwin=false
51+
nonstop=false
3352
case "`uname`" in
3453
CYGWIN* )
3554
cygwin=true
@@ -40,31 +59,11 @@ case "`uname`" in
4059
MINGW* )
4160
msys=true
4261
;;
62+
NONSTOP* )
63+
nonstop=true
64+
;;
4365
esac
4466

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-
50-
# Attempt to set APP_HOME
51-
# Resolve links: $0 may be a link
52-
PRG="$0"
53-
# Need this for relative symlinks.
54-
while [ -h "$PRG" ] ; do
55-
ls=`ls -ld "$PRG"`
56-
link=`expr "$ls" : '.*-> \(.*\)$'`
57-
if expr "$link" : '/.*' > /dev/null; then
58-
PRG="$link"
59-
else
60-
PRG=`dirname "$PRG"`"/$link"
61-
fi
62-
done
63-
SAVED="`pwd`"
64-
cd "`dirname \"$PRG\"`/" >&-
65-
APP_HOME="`pwd -P`"
66-
cd "$SAVED" >&-
67-
6867
CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
6968

7069
# Determine the Java command to use to start the JVM.
@@ -90,7 +89,7 @@ location of your Java installation."
9089
fi
9190

9291
# Increase the maximum file descriptors if we can.
93-
if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then
92+
if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
9493
MAX_FD_LIMIT=`ulimit -H -n`
9594
if [ $? -eq 0 ] ; then
9695
if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
@@ -114,6 +113,7 @@ fi
114113
if $cygwin ; then
115114
APP_HOME=`cygpath --path --mixed "$APP_HOME"`
116115
CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
116+
JAVACMD=`cygpath --unix "$JAVACMD"`
117117

118118
# We build the pattern for arguments to be converted via cygpath
119119
ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
@@ -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 "$@")
163+
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
163171

164-
exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"
172+
exec "$JAVACMD" "$@"

gradlew.bat

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,14 @@
88
@rem Set local scope for the variables with windows NT shell
99
if "%OS%"=="Windows_NT" setlocal
1010

11-
@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
12-
set DEFAULT_JVM_OPTS=
13-
1411
set DIRNAME=%~dp0
1512
if "%DIRNAME%" == "" set DIRNAME=.
1613
set APP_BASE_NAME=%~n0
1714
set APP_HOME=%DIRNAME%
1815

16+
@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
17+
set DEFAULT_JVM_OPTS=
18+
1919
@rem Find java.exe
2020
if defined JAVA_HOME goto findJavaFromJavaHome
2121

@@ -46,10 +46,9 @@ echo location of your Java installation.
4646
goto fail
4747

4848
:init
49-
@rem Get command-line arguments, handling Windowz variants
49+
@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
@@ -87,4 +81,4 @@ exit /b 1
8781
:mainEnd
8882
if "%OS%"=="Windows_NT" endlocal
8983

90-
:omega
84+
:omega

library/build.gradle

Lines changed: 14 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,30 @@
1-
apply plugin: 'android-library'
1+
import com.android.builder.core.BuilderConstants
22

3+
apply plugin: 'com.android.library'
34
android {
4-
buildToolsVersion '19.0.0'
5-
compileSdkVersion 19
5+
buildToolsVersion '27.0.3'
6+
compileSdkVersion 26
67

78
defaultConfig {
89
minSdkVersion 7
910
}
10-
}
1111

12+
defaultPublishConfig "release"
13+
compileOptions {
14+
sourceCompatibility JavaVersion.VERSION_1_7
15+
targetCompatibility JavaVersion.VERSION_1_7
16+
}
17+
}
1218
android.libraryVariants.all { variant ->
1319
def name = variant.buildType.name
14-
if (name.equals(com.android.builder.BuilderConstants.DEBUG)) {
20+
if (name == BuilderConstants.DEBUG) {
1521
return; // Skip debug builds.
1622
}
1723
def task = project.tasks.create "jar${name.capitalize()}", Jar
1824
task.dependsOn variant.javaCompile
1925
task.from variant.javaCompile.destinationDir
2026
artifacts.add('archives', task);
2127
}
22-
23-
apply from: 'https://raw.github.com/chrisbanes/gradle-mvn-push/master/gradle-mvn-push.gradle'
28+
apply from: 'https://raw.github.com/chrisbanes/gradle-mvn-push/master/gradle-mvn-push.gradle'
29+
dependencies {
30+
}

samples/database-v1/build.gradle

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

33
dependencies {
4-
compile project(':library')
4+
implementation project(':library')
55
}
66

77
android {
8-
buildToolsVersion '19.0.0'
9-
compileSdkVersion 19
8+
buildToolsVersion '27.0.3'
9+
compileSdkVersion 26
1010

1111
defaultConfig {
1212
minSdkVersion 8
13-
packageName 'com.example.sqliteassethelper'
14-
targetSdkVersion 19
13+
applicationId 'com.example.sqliteassethelper'
14+
targetSdkVersion 26
1515
versionCode 1
1616
versionName '1.0'
1717
}
18-
1918
}
Lines changed: 7 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,27 @@
1-
buildscript {
2-
repositories {
3-
mavenCentral()
4-
}
5-
dependencies {
6-
classpath 'com.android.tools.build:gradle:0.7.+'
7-
}
8-
}
9-
apply plugin: 'android'
1+
apply plugin: 'com.android.application'
102

113
repositories {
124
mavenCentral()
135
}
146

157
android {
16-
compileSdkVersion 19
17-
buildToolsVersion "19.0.0"
8+
compileSdkVersion 26
9+
buildToolsVersion '27.0.3'
1810

1911
defaultConfig {
2012
minSdkVersion 8
21-
targetSdkVersion 19
13+
targetSdkVersion 26
2214
versionCode 3
2315
versionName "3.0"
2416
}
2517
buildTypes {
2618
release {
27-
runProguard false
19+
minifyEnabled false
2820
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt'
2921
}
3022
}
3123
}
3224

3325
dependencies {
34-
compile project(':library')
35-
}
26+
implementation project(':library')
27+
}
Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,18 @@
1-
apply plugin: 'android'
1+
apply plugin: 'com.android.application'
22

33
dependencies {
4-
compile project(':library')
4+
implementation project(':library')
55
}
66

77
android {
8-
buildToolsVersion '19.0.0'
9-
compileSdkVersion 19
8+
buildToolsVersion '27.0.3'
9+
compileSdkVersion 26
1010

1111
defaultConfig {
1212
minSdkVersion 8
13-
packageName 'com.example.sqliteassethelper'
14-
targetSdkVersion 19
13+
applicationId 'com.example.sqliteassethelper'
14+
targetSdkVersion 26
1515
versionCode 2
1616
versionName '2.0'
1717
}
18-
1918
}

0 commit comments

Comments
 (0)