Merge pull request #149 from nhaarman/update-build

Update build
nhaarman · Sep 15, 2019 · 64eb498 · 64eb498
2 parents 62e23a4 + ac41e12
commit 64eb498
Show file tree

Hide file tree

Showing 11 changed files with 26 additions and 24 deletions.
diff --git a/build.gradle b/build.gradle
@@ -1,5 +1,5 @@
 buildscript {
-    ext.kotlinVersion = "1.3.31"
+    ext.kotlinVersion = "1.3.50"
 
     repositories {
         google()
@@ -8,20 +8,20 @@ buildscript {
 
     configurations.maybeCreate("pitest")
     dependencies {
-        classpath("com.android.tools.build:gradle:3.4.2")
+        classpath("com.android.tools.build:gradle:3.5.0")
         classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion")
-        classpath("de.mannodermaus.gradle.plugins:android-junit5:1.5.0.0")
+        classpath("de.mannodermaus.gradle.plugins:android-junit5:1.5.1.0")
         classpath("com.adarshr:gradle-test-logger-plugin:1.7.0")
         classpath("org.jetbrains.dokka:dokka-gradle-plugin:0.9.17")
         classpath("org.jetbrains.dokka:dokka-android-gradle-plugin:0.9.17")
         classpath("digital.wup:android-maven-publish:3.6.2")
-        classpath("info.solidsoft.gradle.pitest:gradle-pitest-plugin:1.4.0")
+        classpath("info.solidsoft.gradle.pitest:gradle-pitest-plugin:1.4.5")
         pitest("org.pitest:pitest-junit5-plugin:0.9")
     }
 }
 
 plugins {
-    id("com.github.ben-manes.versions") version "0.21.0"
+    id("com.github.ben-manes.versions") version "0.25.0"
     id("io.spring.dependency-management") version "1.0.8.RELEASE"
 }
 

diff --git a/dependencies.gradle b/dependencies.gradle
@@ -5,28 +5,28 @@ dependencyManagement {
         dependency "org.jetbrains.kotlin:kotlin-stdlib:$kotlinVersion"
 
         // core dependencies
-        dependency "androidx.annotation:annotation:1.0.2"
+        dependency "androidx.annotation:annotation:1.1.0"
 
         // ext-acorn
         dependency "io.arrow-kt:arrow-core:0.8.2"
 
         // ext-acorn-android
-        dependency "androidx.appcompat:appcompat:1.0.2"
+        dependency "androidx.appcompat:appcompat:1.1.0"
         dependency "androidx.interpolator:interpolator:1.0.0"
 
         // ext-acorn-rx
-        dependency "io.reactivex.rxjava2:rxjava:2.2.8"
-        dependency "io.reactivex.rxjava2:rxkotlin:2.3.0"
+        dependency "io.reactivex.rxjava2:rxjava:2.2.12"
+        dependency "io.reactivex.rxjava2:rxkotlin:2.4.0"
 
         // ext-acorn-android-timber
         dependency "com.jakewharton.timber:timber:4.7.1"
 
         // ext-acorn-android-lifecycle
-        dependency "androidx.lifecycle:lifecycle-runtime:2.0.0"
+        dependency "androidx.lifecycle:lifecycle-runtime:2.1.0"
 
 
         // "Hello"-sample apps
-        dependency "androidx.core:core-ktx:1.0.2"
+        dependency "androidx.core:core-ktx:1.1.0"
         dependency "com.google.android.material:material:1.0.0"
         dependency "androidx.constraintlayout:constraintlayout:2.0.0-beta2"
         dependency "io.reactivex.rxjava2:rxandroid:2.1.1"

diff --git a/docs/build.gradle b/docs/build.gradle
@@ -1,12 +1,12 @@
 plugins {
-    id "com.eden.orchidPlugin" version "0.17.1"
+    id "com.eden.orchidPlugin" version "0.17.4"
 }
 
 dependencies {
-    orchidRuntime "io.github.javaeden.orchid:OrchidDocs:0.17.1"
-    orchidRuntime "io.github.javaeden.orchid:OrchidKotlindoc:0.17.1"
-    orchidRuntime "io.github.javaeden.orchid:OrchidPluginDocs:0.17.1"
-    orchidRuntime "io.github.javaeden.orchid:OrchidSyntaxHighlighter:0.17.1"
+    orchidRuntime "io.github.javaeden.orchid:OrchidDocs:0.17.4"
+    orchidRuntime "io.github.javaeden.orchid:OrchidKotlindoc:0.17.4"
+    orchidRuntime "io.github.javaeden.orchid:OrchidPluginDocs:0.17.4"
+    orchidRuntime "io.github.javaeden.orchid:OrchidSyntaxHighlighter:0.17.4"
 }
 
 repositories {

diff --git a/...corn-android-appcompat/src/main/java/com/nhaarman/acorn/android/AcornAppCompatActivity.kt b/...corn-android-appcompat/src/main/java/com/nhaarman/acorn/android/AcornAppCompatActivity.kt
@@ -154,6 +154,7 @@ abstract class AcornAppCompatActivity : AppCompatActivity() {
 
     @CallSuper
     override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
+        super.onActivityResult(requestCode, resultCode, data)
         acornDelegate.onActivityResult(requestCode, resultCode, data)
     }
 

diff --git a/...acorn-android/src/main/java/com/nhaarman/acorn/android/transition/TransitionFactoryDSL.kt b/...acorn-android/src/main/java/com/nhaarman/acorn/android/transition/TransitionFactoryDSL.kt
@@ -44,7 +44,8 @@ fun sceneTransitionFactory(
  */
 @Deprecated(
     "Use sceneTransitionFactory(SceneTransitionFactoryBuilder.() -> Unit) instead",
-    ReplaceWith("sceneTransitionFactory(init)")
+    ReplaceWith("sceneTransitionFactory(init)"),
+    DeprecationLevel.ERROR
 )
 fun sceneTransitionFactory(
     viewControllerFactory: ViewControllerFactory,

diff --git a/ext/acorn/acorn-rx/src/main/java/com/nhaarman/acorn/presentation/RxScene.kt b/ext/acorn/acorn-rx/src/main/java/com/nhaarman/acorn/presentation/RxScene.kt
@@ -131,7 +131,7 @@ abstract class RxScene<V : Container>(
      * A utility function to combine an arbitrary stream of [T]'s with the
      * currently attached [V] instance.
      */
-    protected fun <T> Observable<T>.combineWithLatestView(): Observable<Pair<T, V?>> {
+    protected fun <T : Any> Observable<T>.combineWithLatestView(): Observable<Pair<T, V?>> {
         return Observables.combineLatest(this, view) { t, v -> t to v.orNull() }
     }
 

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.5.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.2-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/gradlew b/gradlew
@@ -125,8 +125,8 @@ if $darwin; then
     GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
 fi
 
-# For Cygwin, switch paths to Windows format before running java
-if $cygwin ; then
+# For Cygwin or MSYS, switch paths to Windows format before running java
+if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
     APP_HOME=`cygpath --path --mixed "$APP_HOME"`
     CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
     JAVACMD=`cygpath --unix "$JAVACMD"`

diff --git a/...tor/src/main/java/com/nhaarman/acorn/samples/helloconcurrentpairnavigator/MainActivity.kt b/...tor/src/main/java/com/nhaarman/acorn/samples/helloconcurrentpairnavigator/MainActivity.kt
@@ -34,7 +34,7 @@ class MainActivity : AcornAppCompatActivity() {
     }
 
     override fun provideTransitionFactory(viewControllerFactory: ViewControllerFactory): SceneTransitionFactory {
-        return sceneTransitionFactory(viewControllerFactory) {
+        return sceneTransitionFactory {
             (SceneKey.defaultKey<FirstScene>() to SceneKey.defaultKey<SecondScene>()) use FirstSecondTransition
             (SceneKey.defaultKey<SecondScene>() to SceneKey.defaultKey<FirstScene>()) use SecondFirstTransition
         }

diff --git a/...imation/src/main/java/com/nhaarman/acorn/samples/hellotransitionanimation/MainActivity.kt b/...imation/src/main/java/com/nhaarman/acorn/samples/hellotransitionanimation/MainActivity.kt
@@ -29,7 +29,7 @@ class MainActivity : AcornAppCompatActivity() {
     }
 
     override fun provideTransitionFactory(viewControllerFactory: ViewControllerFactory): SceneTransitionFactory {
-        return sceneTransitionFactory(viewControllerFactory) {
+        return sceneTransitionFactory {
             (FirstScene::class to SecondScene::class) use FirstToSecondTransition
         }
     }

diff --git a/...pp/android/src/main/java/com/nhaarman/acorn/notesapp/android/TransitionFactoryProvider.kt b/...pp/android/src/main/java/com/nhaarman/acorn/notesapp/android/TransitionFactoryProvider.kt
@@ -30,7 +30,7 @@ import com.nhaarman.acorn.notesapp.presentation.itemlist.ItemListScene
 object TransitionFactoryProvider {
 
     val transitionFactory: SceneTransitionFactory by lazy {
-        sceneTransitionFactory(ViewFactoryProvider.viewFactory) {
+        sceneTransitionFactory {
             (ItemListScene::class to CreateItemScene::class) use ItemListCreateItemTransition
 
             (ItemListScene::class to EditItemScene::class) use ItemListEditItemTransition