Bump support lib version.

pardom-zz · Aug 29, 2016 · 5b98b1b · 5b98b1b
1 parent 1b0b205
commit 5b98b1b
Show file tree

Hide file tree

Showing 9 changed files with 127 additions and 125 deletions.
diff --git a/android/build.gradle b/android/build.gradle
@@ -34,7 +34,7 @@ dependencies {
 
 	provided javaxAnnotation
 
-	compile androidSupport
+	compile androidSupportCoreUi
 	compile androidSupportAppCompat
 	compile androidSupportDesign
 	compile androidSupportRecyclerView

diff --git a/android/src/main/kotlin/clean/news/ui/item/detail/ItemDetailView.kt b/android/src/main/kotlin/clean/news/ui/item/detail/ItemDetailView.kt
@@ -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

diff --git a/android/src/main/kotlin/clean/news/ui/item/url/ItemUrlView.kt b/android/src/main/kotlin/clean/news/ui/item/url/ItemUrlView.kt
@@ -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))

diff --git a/build.gradle b/build.gradle
@@ -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"
 }
diff --git a/data/build.gradle b/data/build.gradle
@@ -21,11 +21,6 @@ android {
 		disable 'InvalidPackage'
 		abortOnError false
 	}
-
-	compileOptions {
-		sourceCompatibility JavaVersion.VERSION_1_7
-		targetCompatibility JavaVersion.VERSION_1_7
-	}
 }
 
 dependencies {

diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -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
diff --git a/gradlew b/gradlew
@@ -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"
 
@@ -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
@@ -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 "$@"
diff --git a/gradlew.bat b/gradlew.bat
@@ -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
 
@@ -49,7 +49,6 @@ goto fail
 @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