Merge pull request #4 from ReKotlin/master

Merge from Rekotlin Fork

Author: kmmraj

README.md

@@ -1,6 +1,5 @@
 
-# ReKotlin-Router [![Build Status](https://travis-ci.org/ReKotlin/rekotlin-router.svg?branch=master)](https://travis-ci.org/ReKotlin/rekotlin-router) [![License MIT](https://img.shields.io/badge/license-MIT-blue.svg?style=flat-square)](https://github.com/ReKotlin/rekotlin-router/blob/master/LICENSE.md)
-
+# ReKotlin-Router [![Build Status](https://travis-ci.org/ReKotlin/rekotlin-router.svg?branch=master)](https://travis-ci.org/ReKotlin/rekotlin-router) [![License MIT](https://img.shields.io/badge/license-MIT-blue.svg?style=flat-square)](https://github.com/ReKotlin/rekotlin-router/blob/master/LICENSE.md) [ ![Download](https://api.bintray.com/packages/kmmraj/rekotlin-router/rekotlin-router/images/download.svg?version=0.1.8) ](https://bintray.com/kmmraj/rekotlin-router/rekotlin-router/0.1.8/link)
 
 A declarative router for [ReKotlin](https://github.com/GeoThings/ReKotlin). Allows developers to declare routes in a similar manner as URLs are used on the web.
 
@@ -24,19 +23,22 @@ This requires to store the current navigation state within the app state and to
 # Installation
 Add the following line along with ReKotlin dependencies in gradle file
 
+#### Version compatible with ReKotlin 1.0.0 +
+
+```Groovy
+implementation 'org.rekotlinrouter:rekotlin-router:0.1.9'
+```
+
+#### Version compatible with ReKotlin version less than 1.0.0
 ```Groovy
-implementation 'org.rekotlinrouter:rekotlin-router:0.1.0'
+implementation 'org.rekotlinrouter:rekotlin-router:0.1.8'
 ```
 
 # Configuration
 
 Extend your app state to include the navigation state:
 
 ```Kotlin
-import org.rekotlinrouter.HasNavigationState
-import org.rekotlinrouter.NavigationState
-import tw.geothings.rekotlin.StateType
-
 data class AppState(override var navigationState: NavigationState,
                          // other application states such as....
                           var authenticationState: AuthenticationState,

build.gradle

@@ -42,9 +42,9 @@ allprojects {
         }
         jcenter()
         mavenCentral()
-        maven {
-            url 'https://rekotlin.s3-ap-southeast-1.amazonaws.com/snapshots'
-        }
+//        maven {
+//            url 'https://rekotlin.s3-ap-southeast-1.amazonaws.com/snapshots'
+//        }
 
     }
 }

rekotlin-router/build.gradle

@@ -9,13 +9,13 @@ apply plugin: 'maven-publish'
 
 
 group 'org.rekotlin-router'
-version '0.1.8'
+version '0.1.9'
 
 
 ext {
     junitPlugin_version = '1.0.0'
     junit_jupiter_version = '5.0.0'
-    rekotlin_version = '0.1.0-SNAPSHOT'
+    rekotlin_version = '1.0.0'
     junit_version = "4.12"
     mockito_core_version = "1.10.19"
     assertj_core_version="3.6.2"
@@ -38,7 +38,7 @@ ext {
     siteUrl = 'https://github.com/kmmraj/rekotlin-router'
     gitUrl = 'https://github.com/kmmraj/rekotlin-router.git'
 
-    libraryVersion = '0.1.0'
+    libraryVersion = '0.1.9'
 
     developerId = 'developerId'
     developerName = 'Mohanraj K.M.'
@@ -58,7 +58,7 @@ android {
         minSdkVersion 16
         targetSdkVersion 25
         versionCode 1
-        versionName "0.1.8"
+        versionName "0.1.9"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
 
     }
@@ -92,8 +92,8 @@ dependencies {
     implementation "com.android.support:appcompat-v7:$android_support_lib_version"
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jre7:$kotlin_version"
 
-    compileOnly "tw.geothings.rekotlin:rekotlin:$rekotlin_version"
-    testImplementation "tw.geothings.rekotlin:rekotlin:$rekotlin_version"
+    compileOnly "org.rekotlin:rekotlin:$rekotlin_version"
+    testImplementation "org.rekotlin:rekotlin:$rekotlin_version"
     testImplementation "junit:junit:$junit_version"
     testImplementation "org.mockito:mockito-core:$mockito_core_version"
     testImplementation "org.assertj:assertj-core:$assertj_core_version"

rekotlin-router/src/main/java/org/rekotlinrouter/NavigationAction.kt

@@ -1,6 +1,6 @@
 package org.rekotlinrouter
 
-import tw.geothings.rekotlin.Action
+import org.rekotlin.Action
 
 
 class SetRouteAction(var route: Route,

rekotlin-router/src/main/java/org/rekotlinrouter/NavigationReducer.kt

@@ -1,6 +1,6 @@
 package org.rekotlinrouter
 
-import tw.geothings.rekotlin.Action
+import org.rekotlin.Action
 
 
 

rekotlin-router/src/main/java/org/rekotlinrouter/Router.kt

@@ -2,10 +2,10 @@ package org.rekotlinrouter
 
 import android.os.Handler
 import android.os.Looper
-import tw.geothings.rekotlin.StateType
-import tw.geothings.rekotlin.Store
-import tw.geothings.rekotlin.StoreSubscriber
-import tw.geothings.rekotlin.Subscription
+import org.rekotlin.StateType
+import org.rekotlin.Store
+import org.rekotlin.StoreSubscriber
+import org.rekotlin.Subscription
 
 
 // TODO: Check is this need to be a singleton ?

rekotlin-router/src/main/java/org/rekotlinrouter/StandardAction.kt

@@ -1,6 +1,6 @@
 package org.rekotlinrouter
 
-import tw.geothings.rekotlin.*
+import org.rekotlin.*
 
 /**
 This is ReKotlin's built in action type, it is the only built in type that conforms to the

rekotlin-router/src/test/java/org/rekotlinrouter/ReKotlinRouterIntegerationTests.kt

@@ -13,9 +13,9 @@ import org.junit.Test
 import org.junit.runner.RunWith
 import org.powermock.core.classloader.annotations.PrepareForTest
 import org.powermock.modules.junit4.PowerMockRunner
-import tw.geothings.rekotlin.Action
-import tw.geothings.rekotlin.StateType
-import tw.geothings.rekotlin.Store
+import org.rekotlin.Action
+import org.rekotlin.StateType
+import org.rekotlin.Store
 import java.util.concurrent.TimeUnit
 
 

rekotlin-router/src/test/java/org/rekotlinrouter/ReKotlinRouterUnitTests.kt

@@ -3,15 +3,8 @@ package org.rekotlinrouter
 
 import org.assertj.core.api.Assertions.assertThat
 import org.junit.Test
-import tw.geothings.rekotlin.StateType
 
 
-/**
-* Created by Mohanraj Karatadipalayam on 27/09/17.
-*/
-
-internal class AppState: StateType
-
 internal class ReKotlinRouterUnitTests {
 
     val mainActivityIdentifier = "MainActivity"
@@ -32,8 +25,8 @@ internal class ReKotlinRouterUnitTests {
         val routingActions = Router.routingActionsForTransitionFrom(oldRoute, newRoute)
 
         // Then
-        var action1Correct: Boolean = false
-        var action2Correct: Boolean = false
+        var action1Correct = false
+        var action2Correct = false
 
         routingActions.forEach { routingAction ->
             when(routingAction) {
@@ -66,8 +59,8 @@ internal class ReKotlinRouterUnitTests {
 
         // Then
         var controllerIndex: Int = -1
-        var toBeReplaced: RouteElementIdentifier=""
-        var new: RouteElementIdentifier=""
+        var toBeReplaced = ""
+        var new = ""
         routingActions.forEach { routingAction ->
 
             when (routingAction) {
@@ -95,8 +88,8 @@ internal class ReKotlinRouterUnitTests {
         val routingActions = Router.routingActionsForTransitionFrom(oldRoute, newRoute)
 
         // Then
-        var action1Correct: Boolean = false
-        var action2Correct: Boolean = false
+        var action1Correct = false
+        var action2Correct = false
 
         routingActions.forEach { routingAction ->
             when(routingAction) {
@@ -135,8 +128,8 @@ internal class ReKotlinRouterUnitTests {
 
         // Then
         var controllerIndex: Int = -1
-        var toBeReplaced: RouteElementIdentifier=""
-        var new: RouteElementIdentifier=""
+        var toBeReplaced = ""
+        var new = ""
         routingActions.forEach { routingAction ->
 
             when (routingAction) {
@@ -164,8 +157,8 @@ internal class ReKotlinRouterUnitTests {
         val routingActions = Router.routingActionsForTransitionFrom(oldRoute, newRoute)
 
         // Then
-        var action1Correct: Boolean = false
-        var action2Correct: Boolean = false
+        var action1Correct = false
+        var action2Correct = false
 
         routingActions.forEach { routingAction ->
             when(routingAction) {
@@ -234,8 +227,8 @@ internal class ReKotlinRouterUnitTests {
         val routingActions = Router.routingActionsForTransitionFrom(oldRoute, newRoute)
 
         // Then
-        var action1Correct: Boolean = false
-        var action2Correct: Boolean = false
+        var action1Correct = false
+        var action2Correct = false
         routingActions.forEach { routingAction ->
             when(routingAction) {
                 is pop -> {
@@ -265,8 +258,8 @@ internal class ReKotlinRouterUnitTests {
         val routingActions = Router.routingActionsForTransitionFrom(oldRoute, newRoute)
 
         // Then
-        var action1Correct: Boolean = false
-        var action2Correct: Boolean = false
+        var action1Correct = false
+        var action2Correct = false
         routingActions.forEach { routingAction ->
             when(routingAction) {
                 is push -> {