Permalink
Browse files

Migrate to Android plugin for Gradle 3.0.1

  • Loading branch information...
petrnohejl committed Dec 11, 2017
1 parent 2f836d1 commit 91ecd4eab080d800c1acf7f409088ce3018b347d
@@ -39,12 +39,12 @@ android {
dependencies {
compile fileTree(dir: "libs", include: ["*.jar"])
compile "com.android.support:support-compat:$androidSupportVersion"
compile "com.android.support:support-core-ui:$androidSupportVersion"
compile "com.android.support:recyclerview-v7:$androidSupportVersion"
compile "com.android.support:support-annotations:$androidSupportVersion"
compile "com.android.support:support-v4:$androidSupportVersion" // https://stackoverflow.com/questions/41568032/android-data-binding-dependency-conflict-with-the-support-library
implementation fileTree(dir: "libs", include: ["*.jar"])
implementation "com.android.support:support-compat:$androidSupportVersion"
implementation "com.android.support:support-core-ui:$androidSupportVersion"
implementation "com.android.support:recyclerview-v7:$androidSupportVersion"
implementation "com.android.support:support-annotations:$androidSupportVersion"
implementation "com.android.support:support-v4:$androidSupportVersion" // https://stackoverflow.com/questions/41568032/android-data-binding-dependency-conflict-with-the-support-library
}
@@ -39,12 +39,12 @@ android {
dependencies {
compile fileTree(dir: "libs", include: ["*.jar"])
compile "android.arch.lifecycle:runtime:$androidArchVersion"
compile "android.arch.lifecycle:extensions:$androidArchBetaVersion"
compile "com.android.support:support-fragment:$androidSupportVersion"
compile "com.android.support:appcompat-v7:$androidSupportVersion"
compile "com.android.support:support-annotations:$androidSupportVersion"
implementation fileTree(dir: "libs", include: ["*.jar"])
implementation "android.arch.lifecycle:runtime:$androidArchVersion"
implementation "android.arch.lifecycle:extensions:$androidArchBetaVersion"
implementation "com.android.support:support-fragment:$androidSupportVersion"
implementation "com.android.support:appcompat-v7:$androidSupportVersion"
implementation "com.android.support:support-annotations:$androidSupportVersion"
annotationProcessor "android.arch.lifecycle:compiler:$androidArchBetaVersion"
}
@@ -35,8 +35,8 @@ android {
dependencies {
compile fileTree(dir: "libs", include: ["*.jar"])
compile "com.android.support:support-annotations:$androidSupportVersion"
implementation fileTree(dir: "libs", include: ["*.jar"])
implementation "com.android.support:support-annotations:$androidSupportVersion"
}
@@ -35,10 +35,10 @@ android {
dependencies {
compile fileTree(dir: "libs", include: ["*.jar"])
compile project(":alfonz-graphics")
compile "com.android.support:support-fragment:$androidSupportVersion"
compile "com.android.support:support-annotations:$androidSupportVersion"
implementation fileTree(dir: "libs", include: ["*.jar"])
implementation project(":alfonz-graphics")
implementation "com.android.support:support-fragment:$androidSupportVersion"
implementation "com.android.support:support-annotations:$androidSupportVersion"
}
@@ -39,11 +39,11 @@ android {
dependencies {
compile fileTree(dir: "libs", include: ["*.jar"])
compile "com.android.support:support-fragment:$androidSupportVersion"
compile "com.android.support:appcompat-v7:$androidSupportVersion"
compile "com.android.support:support-annotations:$androidSupportVersion"
compile "eu.inloop:androidviewmodel:$androidViewModelVersion"
implementation fileTree(dir: "libs", include: ["*.jar"])
implementation "com.android.support:support-fragment:$androidSupportVersion"
implementation "com.android.support:appcompat-v7:$androidSupportVersion"
implementation "com.android.support:support-annotations:$androidSupportVersion"
api "eu.inloop:androidviewmodel:$androidViewModelVersion"
}
@@ -1,5 +1,4 @@
apply plugin: "com.android.library"
apply plugin: "me.tatarka.retrolambda"
apply from: "../utils.gradle"
@@ -36,12 +35,13 @@ android {
dependencies {
compile fileTree(dir: "libs", include: ["*.jar"])
compile project(":alfonz-rx")
compile "com.android.support:support-annotations:$androidSupportVersion"
compile "com.squareup.okhttp3:okhttp:$okHttpVersion"
compile "com.squareup.retrofit2:retrofit:$retrofitVersion"
compile "io.reactivex.rxjava2:rxjava:$rxJavaVersion"
implementation fileTree(dir: "libs", include: ["*.jar"])
implementation project(":alfonz-rx")
implementation "com.android.support:support-core-utils:$androidSupportVersion"
implementation "com.android.support:support-annotations:$androidSupportVersion"
implementation "com.squareup.okhttp3:okhttp:$okHttpVersion"
implementation "com.squareup.retrofit2:retrofit:$retrofitVersion"
implementation "io.reactivex.rxjava2:rxjava:$rxJavaVersion"
}
@@ -1,5 +1,4 @@
apply plugin: "com.android.library"
apply plugin: "me.tatarka.retrolambda"
apply from: "../utils.gradle"
@@ -36,12 +35,12 @@ android {
dependencies {
compile fileTree(dir: "libs", include: ["*.jar"])
compile "com.android.support:support-core-utils:$androidSupportVersion"
compile "com.android.support:support-annotations:$androidSupportVersion"
compile "com.jakewharton.rxrelay2:rxrelay:$rxRelayVersion"
compile "io.reactivex.rxjava2:rxandroid:$rxAndroidVersion"
compile "io.reactivex.rxjava2:rxjava:$rxJavaVersion"
implementation fileTree(dir: "libs", include: ["*.jar"])
implementation "com.android.support:support-core-utils:$androidSupportVersion"
implementation "com.android.support:support-annotations:$androidSupportVersion"
implementation "com.jakewharton.rxrelay2:rxrelay:$rxRelayVersion"
implementation "io.reactivex.rxjava2:rxandroid:$rxAndroidVersion"
implementation "io.reactivex.rxjava2:rxjava:$rxJavaVersion"
}
@@ -35,10 +35,10 @@ android {
dependencies {
compile fileTree(dir: "libs", include: ["*.jar"])
compile "com.android.support:support-fragment:$androidSupportVersion"
compile "com.android.support:support-annotations:$androidSupportVersion"
compile "com.android.support:design:$androidSupportVersion"
implementation fileTree(dir: "libs", include: ["*.jar"])
implementation "com.android.support:support-fragment:$androidSupportVersion"
implementation "com.android.support:support-annotations:$androidSupportVersion"
implementation "com.android.support:design:$androidSupportVersion"
}
@@ -35,8 +35,8 @@ android {
dependencies {
compile fileTree(dir: "libs", include: ["*.jar"])
compile "com.android.support:support-annotations:$androidSupportVersion"
implementation fileTree(dir: "libs", include: ["*.jar"])
implementation "com.android.support:support-annotations:$androidSupportVersion"
}
@@ -51,14 +51,14 @@ buildscript {
}
repositories {
google()
jcenter()
}
dependencies {
classpath "com.android.tools.build:gradle:2.3.3"
classpath "com.android.tools.build:gradle:3.0.1"
classpath "com.jfrog.bintray.gradle:gradle-bintray-plugin:1.7.3"
classpath "com.github.dcendents:android-maven-gradle-plugin:1.5"
classpath "me.tatarka:gradle-retrolambda:3.7.0"
// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
@@ -67,10 +67,8 @@ buildscript {
allprojects {
repositories {
google()
jcenter()
maven {
url "https://maven.google.com"
}
}
}
BIN +693 Bytes (100%) gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
@@ -1,6 +1,6 @@
#Tue Apr 04 13:47:25 CEST 2017
#Mon Dec 11 21:57:41 CET 2017
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip
72 gradlew
@@ -1,25 +1,43 @@
#!/usr/bin/env bash
#!/usr/bin/env sh
##############################################################################
##
## Gradle start up script for UN*X
##
##############################################################################
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
DEFAULT_JVM_OPTS=""
# Attempt to set APP_HOME
# Resolve links: $0 may be a link
PRG="$0"
# Need this for relative symlinks.
while [ -h "$PRG" ] ; do
ls=`ls -ld "$PRG"`
link=`expr "$ls" : '.*-> \(.*\)$'`
if expr "$link" : '/.*' > /dev/null; then
PRG="$link"
else
PRG=`dirname "$PRG"`"/$link"
fi
done
SAVED="`pwd`"
cd "`dirname \"$PRG\"`/" >/dev/null
APP_HOME="`pwd -P`"
cd "$SAVED" >/dev/null
APP_NAME="Gradle"
APP_BASE_NAME=`basename "$0"`
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
DEFAULT_JVM_OPTS=""
# Use the maximum available, or set MAX_FD != -1 to use that value.
MAX_FD="maximum"
warn ( ) {
warn () {
echo "$*"
}
die ( ) {
die () {
echo
echo "$*"
echo
@@ -30,6 +48,7 @@ die ( ) {
cygwin=false
msys=false
darwin=false
nonstop=false
case "`uname`" in
CYGWIN* )
cygwin=true
@@ -40,26 +59,11 @@ case "`uname`" in
MINGW* )
msys=true
;;
NONSTOP* )
nonstop=true
;;
esac
# Attempt to set APP_HOME
# Resolve links: $0 may be a link
PRG="$0"
# Need this for relative symlinks.
while [ -h "$PRG" ] ; do
ls=`ls -ld "$PRG"`
link=`expr "$ls" : '.*-> \(.*\)$'`
if expr "$link" : '/.*' > /dev/null; then
PRG="$link"
else
PRG=`dirname "$PRG"`"/$link"
fi
done
SAVED="`pwd`"
cd "`dirname \"$PRG\"`/" >/dev/null
APP_HOME="`pwd -P`"
cd "$SAVED" >/dev/null
CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
# Determine the Java command to use to start the JVM.
@@ -85,7 +89,7 @@ location of your Java installation."
fi
# Increase the maximum file descriptors if we can.
if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then
if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
MAX_FD_LIMIT=`ulimit -H -n`
if [ $? -eq 0 ] ; then
if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
@@ -150,11 +154,19 @@ if $cygwin ; then
esac
fi
# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules
function splitJvmOpts() {
JVM_OPTS=("$@")
# Escape application args
save () {
for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
echo " "
}
eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"
APP_ARGS=$(save "$@")
# Collect all arguments for the java command, following the shell quoting and substitution rules
eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
cd "$(dirname "$0")"
fi
exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"
exec "$JAVACMD" "$@"
@@ -8,14 +8,14 @@
@rem Set local scope for the variables with windows NT shell
if "%OS%"=="Windows_NT" setlocal
@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
set DEFAULT_JVM_OPTS=
set DIRNAME=%~dp0
if "%DIRNAME%" == "" set DIRNAME=.
set APP_BASE_NAME=%~n0
set APP_HOME=%DIRNAME%
@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
set DEFAULT_JVM_OPTS=
@rem Find java.exe
if defined JAVA_HOME goto findJavaFromJavaHome
@@ -46,10 +46,9 @@ echo location of your Java installation.
goto fail
:init
@rem Get command-line arguments, handling Windowz variants
@rem Get command-line arguments, handling Windows variants
if not "%OS%" == "Windows_NT" goto win9xME_args
if "%@eval[2+2]" == "4" goto 4NT_args
:win9xME_args
@rem Slurp the command line arguments.
@@ -60,11 +59,6 @@ set _SKIP=2
if "x%~1" == "x" goto execute
set CMD_LINE_ARGS=%*
goto execute
:4NT_args
@rem Get arguments from the 4NT Shell from JP Software
set CMD_LINE_ARGS=%$
:execute
@rem Setup the command line
Oops, something went wrong.

0 comments on commit 91ecd4e

Please sign in to comment.