Clean up (#18)

* Clean up

* Travis Script Cleanup

* Checkin gradle.props

* Fix build

* Update to latest version of ReKotlin Library

Author: kaustavjaiswal

.travis.yml

@@ -3,89 +3,40 @@ sudo: required
 jdk: oraclejdk8
 
 before_cache:
- - rm -f $HOME/.gradle/caches/modules-2/modules-2.lock
- - rm -fr $HOME/.gradle/caches/*/plugin-resolution/
+  - rm -f $HOME/.gradle/caches/modules-2/modules-2.lock
+  - rm -fr $HOME/.gradle/caches/*/plugin-resolution/
 
 cache:
- directories:
- - $HOME/.gradle/caches/
- - $HOME/.gradle/wrapper/
+  directories:
+    - $HOME/.gradle/caches/
+    - $HOME/.gradle/wrapper/
+    - $HOME/.android/build-cache
 
 env:
- global:
- - ANDROID_API=26
- - ANDROID_BUILD_TOOLS=26.0.2
+  global:
+    - ANDROID_API=28
+    - ANDROID_BUILD_TOOLS=28.0.3
 
 android:
- components:
- - tools
- - platform-tools
- - build-tools-26.0.1
- - build-tools-$ANDROID_BUILD_TOOLS
- - android-$ANDROID_API
- - extra-android-support
- - android-$EMULATOR_API_LEVEL
- - extra-google-m2repository
- - extra-android-m2repository # for design library
- - addon-google_apis-google-19 # google play services
-
- licenses:
- - android-sdk-preview-license-.+
- - android-sdk-license-.+
- - google-gdk-license-.+
+  components:
+    - tools
+    - platform-tools
+    - extra-android-m2repository
+  licenses:
+    - 'android-sdk-preview-license-52d11cd2'
+    - 'android-sdk-license-.+'
+    - 'google-gdk-license-.+'
 
 before_install:
-- mkdir "$ANDROID_HOME/licenses" || true
-- echo -e "\n8933bad161af4178b1185d1a37fbf41ea5269c55" > "$ANDROID_HOME/licenses/android-sdk-license"
-- echo -e "\n84831b9409646a918e30573bab4c9c91346d8abd" > "$ANDROID_HOME/licenses/android-sdk-preview-license"
-- chmod +x gradlew
-
-
-
-install:
-  # List and delete unnecessary components to free space
-  - sdkmanager --list || true
-  - sdkmanager --uninstall "system-images;android-15;default;armeabi-v7a"
-  - sdkmanager --uninstall "system-images;android-16;default;armeabi-v7a"
-  - sdkmanager --uninstall "system-images;android-17;default;armeabi-v7a"
-  - sdkmanager --uninstall "system-images;android-18;default;armeabi-v7a"
-  - sdkmanager --uninstall "system-images;android-19;default;armeabi-v7a"
-  - sdkmanager --uninstall "system-images;android-21;default;armeabi-v7a"
-  - sdkmanager --uninstall "extras;google;google_play_services"
-  - sdkmanager --uninstall "extras;android;support"
-  - sdkmanager --uninstall "platforms;android-10"
-  - sdkmanager --uninstall "platforms;android-15"
-  - sdkmanager --uninstall "platforms;android-16"
-  - sdkmanager --uninstall "platforms;android-17"
-  - sdkmanager --uninstall "platforms;android-18"
-  - sdkmanager --uninstall "platforms;android-19"
-  - sdkmanager --uninstall "platforms;android-20"
-  - sdkmanager --uninstall "platforms;android-21"
-  - sdkmanager --uninstall "build-tools;21.1.2"
-  # Update sdk tools to latest version and install/update components
-  - echo yes | sdkmanager "tools"
-  - echo yes | sdkmanager "platforms;android-25" # Latest platform required by SDK tools
-  - echo yes | sdkmanager "platforms;android-${ANDROID_API}" # Android platform required by emulator
-  - echo yes | sdkmanager "extras;android;m2repository"
-  - echo yes | sdkmanager "extras;google;m2repository"
-  - echo yes | sdkmanager "extras;m2repository;com;android;support;constraint;constraint-layout;1.0.2"
-  - echo yes | sdkmanager "extras;m2repository;com;android;support;constraint;constraint-layout-solver;1.0.2"
-  #- echo yes | sdkmanager "$EMULATOR" # Install emulator system image
-  # Create and start emulator
- # - echo no | avdmanager create avd -n acib -k "$EMULATOR" -f --abi "$ABI" --tag "$TAG"
-#  - emulator -avd acib -engine classic -no-window -camera-back none -camera-front none -verbose -qemu -m 512 &
-  # Start adbd, wait for device connected and show android serial
-#  - adb wait-for-device get-serialno
-  # Show version and download Gradle Wrapper if it's not already cached
- # - cd ${TRAVIS_BUILD_DIR}/${DIR} && ./gradlew --version
-  # Clean project and download missing dependencies and components
-#  - cd ${TRAVIS_BUILD_DIR}/${DIR} && ./gradlew clean build
-  # Check components status
-  - sdkmanager --list || true
-
-#checkout:
-#  post:
-#    - cp local.properties.ci local.properties
+  - touch $HOME/.android/repositories.cfg
+  - yes | sdkmanager "platforms;android-$ANDROID_API"
+  - yes | sdkmanager "build-tools;$ANDROID_BUILD_TOOLS"
+  - mkdir "$ANDROID_HOME/licenses" || true
+  - echo -e "\n8933bad161af4178b1185d1a37fbf41ea5269c55" > "$ANDROID_HOME/licenses/android-sdk-license"
+  - echo -e "\n84831b9409646a918e30573bab4c9c91346d8abd" > "$ANDROID_HOME/licenses/android-sdk-preview-license"
+  - yes | sdkmanager "platforms;android-28"
+  - yes | sdkmanager "build-tools;28.0.3"
+  - chmod +x gradlew
 
 script:
   - cp local.properties.ci local.properties

build.gradle

@@ -1,26 +1,31 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 buildscript {
     ext {
-        kotlin_version = '1.3.30'
+        kotlin_version = '1.3.31'
         dokka_version = '0.9.18'
-        rekotlin_version = '1.0.0'
-        gradle_bintray_plugin_version = "1.4"
-        android_maven_gradle_plugin_version = "1.4.1"
-        jacoco_android_version = "0.1.1"
+        rekotlin_version = '1.0.3'
+        gradle_bintray_plugin_version = "1.8.4"
         android_tools_build_gradle_version = "3.4.0"
+        junit_version = "4.12"
+        mockito_core_version = "1.10.19"
+        assertj_core_version = "3.6.2"
+        androidx_version = "1.0.2"
+        powermock_module_junit4_version = "1.7.0RC2"
+        powermock_api_mockito2_version = "1.7.0RC2"
+        awaitility_version = "3.0.0"
     }
 
     repositories {
         google()
         jcenter()
         mavenLocal()
     }
+
     dependencies {
         classpath "com.android.tools.build:gradle:${android_tools_build_gradle_version}"
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:${kotlin_version}"
         classpath "org.jetbrains.dokka:dokka-android-gradle-plugin:${dokka_version}"
         classpath "com.jfrog.bintray.gradle:gradle-bintray-plugin:${gradle_bintray_plugin_version}"
-
     }
 }
 
@@ -34,5 +39,4 @@ allprojects {
 
 task clean(type: Delete) {
     delete rootProject.buildDir
-}
-
+}

gradle.properties

@@ -0,0 +1,2 @@
+android.enableJetifier=true
+android.useAndroidX=true

local.properties.ci

@@ -8,4 +8,3 @@
 # For customization when using a Version Control System, please read the
 # header note.
 #Sat Nov 11 06:13:55 IST 2017
-#sdk.dir=/Users/mkaratadipalayam/Library/Android/sdk

rekotlin-router/build.gradle

@@ -2,9 +2,9 @@ apply plugin: 'com.android.library'
 apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-android-extensions'
 apply plugin: 'org.jetbrains.dokka-android'
-apply plugin: "com.jfrog.bintray"
-apply plugin: 'jacoco'
 apply plugin: 'maven-publish'
+apply plugin: 'com.jfrog.bintray'
+apply plugin: 'jacoco'
 
 group 'org.rekotlin-router'
 version '0.2.0'
@@ -13,15 +13,6 @@ def siteUrl = 'https://github.com/ReKotlin/rekotlin-router'      // Homepage URL
 def gitUrl = 'https://github.com/ReKotlin/rekotlin-router.git'   // Git repository URL // Maven Group ID for the artifact
 
 ext {
-    rekotlin_version = '1.0.0'
-    junit_version = "4.12"
-    mockito_core_version = "1.10.19"
-    assertj_core_version = "3.6.2"
-    androidx_version = "1.0.2"
-    powermock_module_junit4_version = "1.7.0RC2"
-    powermock_api_mockito2_version = "1.7.0RC2"
-    awaitility_version = "3.0.0"
-
     bintrayRepo = 'rekotlin-router'
     bintrayName = 'rekotlin-router'
 
@@ -49,7 +40,7 @@ android {
         targetSdkVersion 28
         versionCode 1
         versionName "0.2.0"
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 
     }
     buildTypes {