Skip to content

Commit 06e0dfd

Browse files
author
Austyn Mahoney
committed
Upgrade build dependencies
- Target & Compile SDK 26 - Gradle v4.3 - Build Tools v27.0.0 - Android Plugin v3.0.0 - Kotlin v1.1.51 - Support Library v26.1.0 - Constraint Layout v1.0.2 - Anko v0.10.2 Fix findViewById type inference issue Fix invalid databinding onClick reference Remove unnecessary repository declaration
1 parent bac6ece commit 06e0dfd

File tree

8 files changed

+62
-58
lines changed

8 files changed

+62
-58
lines changed

gradle/android-databinding/app/build.gradle

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@ apply plugin: 'kotlin-android'
33
apply plugin: 'kotlin-kapt'
44

55
android {
6-
compileSdkVersion 25
7-
buildToolsVersion "25.0.3"
6+
compileSdkVersion 26
7+
buildToolsVersion "27.0.0"
88
defaultConfig {
99
applicationId "org.example.kotlin.databinding"
1010
minSdkVersion 18
11-
targetSdkVersion 25
11+
targetSdkVersion 26
1212
versionCode 1
1313
versionName "1.0"
1414
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
@@ -29,19 +29,16 @@ dependencies {
2929
androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', {
3030
exclude group: 'com.android.support', module: 'support-annotations'
3131
})
32-
compile 'com.android.support:appcompat-v7:25.3.1'
33-
compile 'com.android.support.constraint:constraint-layout:1.0.1'
34-
compile "com.android.support:recyclerview-v7:25.3.1"
32+
compile 'com.android.support:appcompat-v7:26.1.0'
33+
compile "com.android.support:recyclerview-v7:26.1.0"
34+
compile 'com.android.support.constraint:constraint-layout:1.0.2'
3535
compile 'com.github.bumptech.glide:glide:3.7.0'
3636

3737
kapt "com.android.databinding:compiler:$android_plugin_version"
3838
compile "org.jetbrains.kotlin:kotlin-stdlib-jre7:$kotlin_version"
3939

4040
compile "org.jetbrains.anko:anko-sdk25:$anko_version"
41-
compile "org.jetbrains.anko:anko-appcompat-v7-common:$anko_version"
41+
compile "org.jetbrains.anko:anko-appcompat-v7-commons:$anko_version"
4242

4343
testCompile 'junit:junit:4.12'
4444
}
45-
repositories {
46-
mavenCentral()
47-
}

gradle/android-databinding/app/src/main/java/org/example/kotlin/databinding/OtherActivity.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ class OtherActivity : AppCompatActivity() {
3333
"Mostly cloudy",
3434
"http://loremflickr.com/800/600/city?random=4"))
3535

36-
val recyclerView = findViewById(R.id.weather_list) as RecyclerView
36+
val recyclerView: RecyclerView = findViewById(R.id.weather_list)
3737
recyclerView.layoutManager = LinearLayoutManager(this)
3838
recyclerView.adapter = WeatherAdapter(items)
3939
}

gradle/android-databinding/app/src/main/res/layout/activity_main.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
android:text="@string/next"
3333
android:layout_width="match_parent"
3434
android:layout_height="wrap_content"
35-
android:onClick="startOtherActivity" />
35+
android:onClick="startActivity" />
3636

3737
</LinearLayout>
3838
</layout>

gradle/android-databinding/build.gradle

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,16 @@
11
// Top-level build file where you can add configuration options common to all sub-projects/modules.
22

33
buildscript {
4-
ext.android_plugin_version = '2.4.0-alpha7'
5-
ext.kotlin_version = '1.1.2-3'
6-
ext.anko_version = '0.10.0-beta-2'
4+
ext.android_plugin_version = '3.0.0'
5+
ext.kotlin_version = '1.1.51'
6+
ext.anko_version = '0.10.2'
77

88
repositories {
99
jcenter()
10+
google()
1011
}
1112
dependencies {
12-
classpath 'com.android.tools.build:gradle:2.3.1'
13+
classpath "com.android.tools.build:gradle:$android_plugin_version"
1314
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
1415

1516
// NOTE: Do not place your application dependencies here; they belong
@@ -20,6 +21,7 @@ buildscript {
2021
allprojects {
2122
repositories {
2223
jcenter()
24+
google()
2325

2426
// for anko library
2527
maven { url "http://dl.bintray.com/kotlin/kotlin-dev" }
1.05 KB
Binary file not shown.
Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
1-
#Tue May 16 18:30:22 MSK 2017
21
distributionBase=GRADLE_USER_HOME
32
distributionPath=wrapper/dists
43
zipStoreBase=GRADLE_USER_HOME
54
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-3.4.1-all.zip
5+
distributionUrl=https\://services.gradle.org/distributions/gradle-4.3-all.zip

gradle/android-databinding/gradlew

Lines changed: 42 additions & 30 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,26 +59,11 @@ case "`uname`" in
4059
MINGW* )
4160
msys=true
4261
;;
62+
NONSTOP* )
63+
nonstop=true
64+
;;
4365
esac
4466

45-
# Attempt to set APP_HOME
46-
# Resolve links: $0 may be a link
47-
PRG="$0"
48-
# Need this for relative symlinks.
49-
while [ -h "$PRG" ] ; do
50-
ls=`ls -ld "$PRG"`
51-
link=`expr "$ls" : '.*-> \(.*\)$'`
52-
if expr "$link" : '/.*' > /dev/null; then
53-
PRG="$link"
54-
else
55-
PRG=`dirname "$PRG"`"/$link"
56-
fi
57-
done
58-
SAVED="`pwd`"
59-
cd "`dirname \"$PRG\"`/" >/dev/null
60-
APP_HOME="`pwd -P`"
61-
cd "$SAVED" >/dev/null
62-
6367
CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
6468

6569
# Determine the Java command to use to start the JVM.
@@ -85,7 +89,7 @@ location of your Java installation."
8589
fi
8690

8791
# Increase the maximum file descriptors if we can.
88-
if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then
92+
if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
8993
MAX_FD_LIMIT=`ulimit -H -n`
9094
if [ $? -eq 0 ] ; then
9195
if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
@@ -150,11 +154,19 @@ if $cygwin ; then
150154
esac
151155
fi
152156

153-
# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules
154-
function splitJvmOpts() {
155-
JVM_OPTS=("$@")
157+
# Escape application args
158+
save () {
159+
for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
160+
echo " "
156161
}
157-
eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
158-
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
159171

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

gradle/android-databinding/gradlew.bat

Lines changed: 4 additions & 10 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

0 commit comments

Comments
 (0)