Skip to content

Commit

Permalink
Merge pull request #34 from pardom/support-lib-update
Browse files Browse the repository at this point in the history
Bump support lib version.
  • Loading branch information
pardom authored Aug 29, 2016
2 parents 1b0b205 + 7ac2fd7 commit f04aed9
Show file tree
Hide file tree
Showing 11 changed files with 161 additions and 127 deletions.
Binary file added .ci/michaelpardo_android.keystore.enc
Binary file not shown.
27 changes: 25 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,14 +1,37 @@
language: android

jdk: oraclejdk8

android:
components:
- tools
- build-tools-23.0.3
- android-23
- extra-android-m2repository

env:
global:
secure: "cnPzBnqXN9BB+rWffIoIjmM7CB25vgoJ2vHb5j3SIx993SCTu2L7/F+kJVqtWYyjmHgcv8RJn+5nrA6JTD53xmJBMtcLBYpA4VNwwQnf3OxrR8eB52MOie5OJ99t5GOt4zLOb+0g9B/1IzSv9U0cLL4r9aeSR5XunHVXs6tzi7NSoqryPvKZ0XMfkYho1bZE3ap7bF6bSGII8bPXEBLGg2aLFutOA5MrQNMRppWEw2/+sbVsCQTpO+kbZbSedWwWG+4gAMi18wZQTIITQOueUW74rPXizhXNwpPUGu8aknocdm5x2DMXsCnxlu1CnSUjn+dJl0pg/yz3mqQWSAjZQDf4W0ys/z8ufPdpssiXyctSNfznRwejirQ5jmkwrQ1fcPyk/jKXlrowtg6xjin8s2qLLietZPgGcz78zTlahLLc03n0aXyCbKrlFE6GVwliJp6yZJaYdw6usNA5+o+ySZ6KrTfEL5Ej9/fEXHb3wsSiqZKWMOu//I9CMGJ4EUMrf6rtGVayZURfprsm7G/jqxAcyukdqyN8PhfOtjRLlHQGVGNm4uFct7313yNUZWsNuC+q/s7jz6nEOG7P22rTeC/uFM3CMul/E+Gk8ILCZjkQfFd6A1m0oJanQToAsMIqJ9uYDG2X+BZPQtcq2gxujhdFyhgigVFs645YC4RGau8="
secure: "TDAFI7unQArUiVTAJPai1SwkixPo3Suv8SGgvqYeM2WXJoCqEYyLpzetnFdcG2FkTPVVtVR5f6fnRt+Kis8d/TjAnjelfd1lVqYKZ3g93qflrKJtjD7zqlv1qlREuSrKBlr9MtsgYgG30d8/A3TSgAkT/Z/XDK3ci9Ukd83FuAcEiq5CwLNy3whDfVdqnBeOZZ/sPlq94nBP3wjJyuf4Xra9dBD05SKo6+viDtXKOK4yB+3nZ/vsQvHLp38l2qX8F8P3I/mfx2NJPph62fyBN4yH7g9s4b/5DrgXZc6/4DQHLYIP5G4qsYwmdH7AIqPKWwzVYc6i3QohWZFGguV20UPCEMpAsZzwHMKuidRsiFn57aaZqkR/j2prMKR6hRmAyjFJMOamLYNR1vpq13k0SKpj5BBcaJgfh1ppvMh9MHEN1nvabrHMLZuKCnuw3ALuXpupvx9O7KqXYw64Ezzo6c6MNLE6X469l6HFbU4s4y2SrdRq10oUhHaF5rlCvS7bYtxcw4vkf1bXUZOsH7VSLgTVESAuJIKh9JdwhVri5+u4ymBmk370VEC2MN7n0rdxGdcf4+wQ870jOLGfJ7PZOzlhq2JcHqYOyr96DtBhOqWegGB+gd2TtRwK+rbwQBd8UkIZLYyIfdAIjrLyykBQda0BYRnKbtc4y5wqj/149XU="
secure: "PhCivaGjVTTjIn00qZjAsAhr4Bhf3n9wUM/6CmWkh2pojHUNsGP6dj+WFmPjFZbtpG4rnbWP+8Rtj5yFkeEyNc7ihXAxlKBXRJ9lJJI4OWlLINKhZ8QpxoB4qsaRvdiZgUMJeZ8+v0wc8x54UgITlb9CfHNOWeMAeTgEFV3g9q3Ki3a+cWKHMJAXA74j3wP2jS8XdWqlHv0cT2hFqfbqhU/w05D24a5KSRjwrzR2H/Y+YGdr1Sc7iN9z1UofEMVy267q722g9xtbtnWAlEwgAH9ywbu9Rr2zzf/5fOJBPUeKJ5XomWx6HRgIF1jg/M4BlzZYQPXN+qGrSJxpU5Y2nEd8CR9S/kTl6oqGbao6bNtPLLWeprWzE1TLaw/t3RO82AbYT71bfvV1Xq4S7wHgxUO5Iv4QwB3GQCHlM/dYXnD7c/9OCsG/i1bTUsdRasH0igK4ncK4Ms0UY6r2NNdCqsKyLK42ayLYtt0oZaeGZ30cNae6nDgTQT+45jxLdTuSavxRTxZ3+LyNvcsNcYjpwb/lNpt3uJbqjxei8dnRCZzdVr5MJtkljloFlJPaFUDF0ZKOZKtj+vdZgHzNsXFI5Vp7C9heRQ/zU2P6Tb1CxpyTvp+pu9VFdzV0fgluigMxx8Ey/+rywCOtiSldi5v9fF+phWw39JYqIYy2/wSclhE="

before_install:
- openssl aes-256-cbc -K $encrypted_ce8155ff0faf_key -iv $encrypted_ce8155ff0faf_iv -in .ci/michaelpardo_android.keystore.enc -out .ci/michaelpardo_android.keystore -d

deploy:
provider: releases
api_key:
secure: f6PvCnhLYnwXkLrsp5IBgU7Mi1oW7pWQlyL7FUAhA8TQhyfRqFZJe4FvlSo70OGVv74uX2gr4G09PQRcYqyUY+oKcnkvokMOh4eCUAybmk/HeqNnv/h0tsqsXZV15a5jJQscwM9PEq8DqVuyRjqHjLAATgd9eokIBJ2QHCAsaYIIrggdIkKzUQzM0C1akaKCWr6DIe9rlmejO+khLog04s9RUDipX/LJ9VpRQi0QQqwLRR7Uagarb8Y1Pl2uWZ63D9axwlEJrauiNDZEscZVXud4rtX9pCCAhnTc5vhVzXE35JkTlX28hDMDVfj+Uc9HGxmkWbJpRGvNc6v628mUGX++UfBo30OM612dfyIu05qBIBRaGKMGESVq3LO2CKLP2E61N5tXXZNai2sCywGmrJcLZ7mLLt+J2xv5y4+U32ULk1jSR6YwJx1/H0gKbH5msTunhChOkw32mNCETMew4b2sRt34IYk4Glhn8Npuyh/nJQYoMddzjDNpnpyh20lvGtQHwGabvFtpTsdUfJFRBW9L+9A96dSlqZFz6qUXMAiTT8DQKFuQcFpjMklOFa5p5tTdWwDpxJi3Iohr9P+91TyQQVmczdXU8755+KT5Q7LX147D7CTuubpllAPhC9/DGvYVyhh4vcaX/ig2zwmI7xw/wWthY4CYdmoR0TiV4OQ=
file:
- android/build/outputs/apk/app-debug.apk
- android/build/outputs/apk/app-release.apk
on:
repo: pardom/CleanNews
branch: master

cache:
directories:
- $HOME/.m2

script: ./gradlew check
- $HOME/.gradle
- $HOME/.gradle/caches/
- $HOME/.gradle/wrapper/
11 changes: 10 additions & 1 deletion android/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,15 @@ android {
main.java.srcDirs += 'src/main/kotlin'
}

signingConfigs {
release {
storeFile file('../.ci/michaelpardo_android.keystore')
storePassword System.getenv('STORE_PASSWORD')
keyAlias = System.getenv('KEY_ALIAS')
keyPassword System.getenv('KEY_PASSWORD')
}
}

lintOptions {
disable 'InvalidPackage'
abortOnError false
Expand All @@ -34,7 +43,7 @@ dependencies {

provided javaxAnnotation

compile androidSupport
compile androidSupportCoreUi
compile androidSupportAppCompat
compile androidSupportDesign
compile androidSupportRecyclerView
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ class ItemDetailView : RelativeLayout {
override fun onFinishInflate() {
super.onFinishInflate()

toolbar.setNavigationIcon(R.drawable.abc_ic_ab_back_mtrl_am_alpha)
toolbar.setNavigationIcon(R.drawable.abc_ic_ab_back_material)
toolbar.inflateMenu(R.menu.item_detail_view)
commentRecyclerView.layoutManager = LinearLayoutManager(context)
commentRecyclerView.adapter = adapter
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ class ItemUrlView : RelativeLayout {
override fun onFinishInflate() {
super.onFinishInflate()

toolbar.setNavigationIcon(R.drawable.abc_ic_ab_back_mtrl_am_alpha)
toolbar.setNavigationIcon(R.drawable.abc_ic_ab_back_material)
toolbar.inflateMenu(R.menu.item_url_view)

webView.setWebChromeClient(LoadingWebChromeClient(progressBar))
Expand Down
174 changes: 89 additions & 85 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,103 +1,107 @@
buildscript {
ext.kotlinVersion = '1.0.3'

ext {
//////////////////////////////////////////////////
// VERSIONS

// Android

androidBuildToolsVersion = '23.0.3'
androidCompileSdkVersion = 23
androidMinSdkVersion = 16
androidTargetSdkVersion = 23

// Desktop

// Libraries

androidSupportVersion = '24.2.0'
daggerVersion = '2.0.2'
flowVersion = '1.0.0-alpha'
javaxAnnotationVersion = '10.0-b28'
javaxInjectVersion = '1'
kotlinVersion = '1.0.3'
kotterKnifeVersion = '0.1.0-SNAPSHOT'
mortarVersion = '0.20'
okHttpVersion = '3.2.0'
paperParcelVersion = '1.0.0-beta8'
phraseVersion = '1.1.0'
reduxKotlinVersion = '1.0.0'
retrofitVersion = '2.0.0'
rxAndroidVersion = '1.1.0'
rxBindingVersion = '0.4.0'
rxJavaVersion = '1.1.1'

// Testing

assertJVersion = '1.7.1'
jUnitVersion = '4.12'
mockitoVersion = '1.10.5'

//////////////////////////////////////////////////
// DEPENDENCIES

// Android

androidSupportCoreUi = "com.android.support:support-core-ui:$androidSupportVersion"
androidSupportAnnotations = "com.android.support:support-annotations:$androidSupportVersion"
androidSupportAppCompat = "com.android.support:appcompat-v7:$androidSupportVersion"
androidSupportDesign = "com.android.support:design:$androidSupportVersion"
androidSupportRecyclerView = "com.android.support:recyclerview-v7:$androidSupportVersion"

// Desktop

// Third-party
dagger = "com.google.dagger:dagger:$daggerVersion"
daggerCompiler = "com.google.dagger:dagger-compiler:$daggerVersion"
flow = "com.squareup.flow:flow:$flowVersion"
javaxAnnotation = "org.glassfish:javax.annotation:$javaxAnnotationVersion"
javaxInject = "javax.inject:javax.inject:$javaxInjectVersion"
kotlinStdLib = "org.jetbrains.kotlin:kotlin-stdlib:$kotlinVersion"
kotterKnife = "com.jakewharton:kotterknife:$kotterKnifeVersion"
mortar = "com.squareup.mortar:mortar:$mortarVersion"
okHttpLoggingInterceptor = "com.squareup.okhttp3:logging-interceptor:$okHttpVersion"
paperParcel = "com.github.grandstaish.paperparcel:paperparcel-kotlin:$paperParcelVersion"
paperParcelCompiler = "com.github.grandstaish.paperparcel:compiler:$paperParcelVersion"
phrase = "com.squareup.phrase:phrase:$phraseVersion"
reduxKotlin = "com.github.pardom:redux-kotlin:$reduxKotlinVersion"
reduxObservableKotlin = "com.github.pardom:redux-observable-kotlin:-SNAPSHOT"
reduxRxJavaKotlin = "com.github.pardom:redux-rxjava-kotlin:-SNAPSHOT"
retrofit = "com.squareup.retrofit2:retrofit:$retrofitVersion"
retrofitAdapterRxJava = "com.squareup.retrofit2:adapter-rxjava:$retrofitVersion"
retrofitConverterMoshi = "com.squareup.retrofit2:converter-moshi:$retrofitVersion"
rxAndroid = "io.reactivex:rxandroid:$rxAndroidVersion"
rxBinding = "com.jakewharton.rxbinding:rxbinding-kotlin:$rxBindingVersion"
rxBindingDesign = "com.jakewharton.rxbinding:rxbinding-design-kotlin:$rxBindingVersion"
rxBindingSupportV4 = "com.jakewharton.rxbinding:rxbinding-support-v4-kotlin:$rxBindingVersion"
rxBindingAppCompatV7 = "com.jakewharton.rxbinding:rxbinding-appcompat-v7-kotlin:$rxBindingVersion"
rxJava = "io.reactivex:rxjava:$rxJavaVersion"

// Testing

assertJ = "org.assertj:assertj-core:$assertJVersion"
jUnit = "junit:junit:$jUnitVersion"
mockito = "org.mockito:mockito-core:$mockitoVersion"
}

repositories {
jcenter()
maven { url "https://oss.sonatype.org/content/repositories/snapshots" }
}

dependencies {
classpath 'com.android.tools.build:gradle:1.5.0'
classpath 'com.android.tools.build:gradle:2.2.0-beta3'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion"
}

}

allprojects {

repositories {
jcenter()
maven { url "https://oss.sonatype.org/content/repositories/snapshots" }
maven { url 'https://jitpack.io' }
}
}

ext {
//////////////////////////////////////////////////
// VERSIONS

// Android

androidBuildToolsVersion = '23.0.3'
androidCompileSdkVersion = 23
androidMinSdkVersion = 16
androidTargetSdkVersion = 23

// Desktop

// Libraries

androidSupportVersion = '23.2.1'
daggerVersion = '2.0.2'
flowVersion = '1.0.0-alpha'
javaxAnnotationVersion = '10.0-b28'
javaxInjectVersion = '1'
kotlinVersion = '1.0.1'
kotterKnifeVersion = '0.1.0-SNAPSHOT'
mortarVersion = '0.20'
okHttpVersion = '3.2.0'
paperParcelVersion = '1.0.0-beta8'
phraseVersion = '1.1.0'
reduxKotlinVersion = '1.0.0'
retrofitVersion = '2.0.0'
rxAndroidVersion = '1.1.0'
rxBindingVersion = '0.4.0'
rxJavaVersion = '1.1.1'

// Testing

assertJVersion = '1.7.1'
jUnitVersion = '4.12'
mockitoVersion = '1.10.5'

//////////////////////////////////////////////////
// DEPENDENCIES

// Android

androidSupport = "com.android.support:support-v4:$androidSupportVersion"
androidSupportAnnotations = "com.android.support:support-annotations:$androidSupportVersion"
androidSupportAppCompat = "com.android.support:appcompat-v7:$androidSupportVersion"
androidSupportDesign = "com.android.support:design:$androidSupportVersion"
androidSupportRecyclerView = "com.android.support:recyclerview-v7:$androidSupportVersion"

// Desktop

// Third-party
dagger = "com.google.dagger:dagger:$daggerVersion"
daggerCompiler = "com.google.dagger:dagger-compiler:$daggerVersion"
flow = "com.squareup.flow:flow:$flowVersion"
javaxAnnotation = "org.glassfish:javax.annotation:$javaxAnnotationVersion"
javaxInject = "javax.inject:javax.inject:$javaxInjectVersion"
kotlinStdLib = "org.jetbrains.kotlin:kotlin-stdlib:$kotlinVersion"
kotterKnife = "com.jakewharton:kotterknife:$kotterKnifeVersion"
mortar = "com.squareup.mortar:mortar:$mortarVersion"
okHttpLoggingInterceptor = "com.squareup.okhttp3:logging-interceptor:$okHttpVersion"
paperParcel = "com.github.grandstaish.paperparcel:paperparcel-kotlin:$paperParcelVersion"
paperParcelCompiler = "com.github.grandstaish.paperparcel:compiler:$paperParcelVersion"
phrase = "com.squareup.phrase:phrase:$phraseVersion"
reduxKotlin = "com.github.pardom:redux-kotlin:$reduxKotlinVersion"
reduxObservableKotlin = "com.github.pardom:redux-observable-kotlin:-SNAPSHOT"
reduxRxJavaKotlin = "com.github.pardom:redux-rxjava-kotlin:-SNAPSHOT"
retrofit = "com.squareup.retrofit2:retrofit:$retrofitVersion"
retrofitAdapterRxJava = "com.squareup.retrofit2:adapter-rxjava:$retrofitVersion"
retrofitConverterMoshi = "com.squareup.retrofit2:converter-moshi:$retrofitVersion"
rxAndroid = "io.reactivex:rxandroid:$rxAndroidVersion"
rxBinding = "com.jakewharton.rxbinding:rxbinding-kotlin:$rxBindingVersion"
rxBindingDesign = "com.jakewharton.rxbinding:rxbinding-design-kotlin:$rxBindingVersion"
rxBindingSupportV4 = "com.jakewharton.rxbinding:rxbinding-support-v4-kotlin:$rxBindingVersion"
rxBindingAppCompatV7 = "com.jakewharton.rxbinding:rxbinding-appcompat-v7-kotlin:$rxBindingVersion"
rxJava = "io.reactivex:rxjava:$rxJavaVersion"

// Testing

assertJ = "org.assertj:assertj-core:$assertJVersion"
jUnit = "junit:junit:$jUnitVersion"
mockito = "org.mockito:mockito-core:$mockitoVersion"
}
5 changes: 0 additions & 5 deletions data/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,6 @@ android {
disable 'InvalidPackage'
abortOnError false
}

compileOptions {
sourceCompatibility JavaVersion.VERSION_1_7
targetCompatibility JavaVersion.VERSION_1_7
}
}

dependencies {
Expand Down
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
4 changes: 2 additions & 2 deletions gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#Thu Mar 17 10:00:08 EDT 2016
#Sun Aug 28 20:57:24 EDT 2016
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-2.12-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-3.0-bin.zip
51 changes: 30 additions & 21 deletions gradlew
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,30 @@
##
##############################################################################

# 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"

Expand All @@ -30,6 +48,7 @@ die ( ) {
cygwin=false
msys=false
darwin=false
nonstop=false
case "`uname`" in
CYGWIN* )
cygwin=true
Expand All @@ -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.
Expand All @@ -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
Expand Down Expand Up @@ -157,4 +161,9 @@ function splitJvmOpts() {
eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"

# 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 "$@"
Loading

0 comments on commit f04aed9

Please sign in to comment.