Merge remote-tracking branch 'origin/develop' into feature/handle-instance-state-split-implementation

Author: Arkadiusz Pałka

.circleci/config.yml

@@ -10,6 +10,9 @@ jobs:
       - checkout
       - restore_cache:
           key: jars-{{ checksum "build.gradle" }}-{{ checksum  "app/build.gradle" }}
+      - run:
+          name: Create empty local properties
+          command: touch local.properties
       - run:
           name: Download Dependencies
           command: ./gradlew androidDependencies

README.md

@@ -46,7 +46,7 @@ android {
 dependencies {
 
     // Implement base library
-    implementation project(':mvi-valueadd')
+    implementation project(':mvi')
 
     // Annotation Processor
     kapt deps.di.toothpick_compiler

app/build.gradle

@@ -9,7 +9,9 @@ buildscript {
     dependencies {
         classpath deps.build.android_gradle_plugin
         classpath deps.build.kotlin_gradle_plugin
-        classpath "de.mannodermaus.gradle.plugins:android-junit5:1.3.2.0"
+        classpath deps.build.junit5_runner
+        classpath deps.build.android_maven
+        classpath deps.build.bintray
     }
 }
 

build.gradle

@@ -63,6 +63,9 @@ versions.fragmentation = "1.0.1"
 versions.material_progress_bar = "1.6.1"
 versions.fast_adapter = "4.0.1"
 versions.mockk = "1.9.3"
+versions.junit5_runner = "1.3.2.0"
+versions.android_maven = "1.4.1"
+versions.bintray = "1.7.3"
 deps.versions = versions
 ext.versions = versions
 
@@ -75,6 +78,9 @@ build.fabric = "io.fabric.tools:gradle:$versions.fabric"
 build.google_services_plugin = "com.google.gms:google-services:$versions.google_plugin"
 build.kotlin_gradle_plugin = "org.jetbrains.kotlin:kotlin-gradle-plugin:$versions.kotlin"
 build.realm_gradle_plugin = "io.realm:realm-gradle-plugin:$versions.realm"
+build.junit5_runner = "de.mannodermaus.gradle.plugins:android-junit5:$versions.junit5_runner"
+build.android_maven = "com.github.dcendents:android-maven-gradle-plugin:$versions.android_maven"
+build.bintray =  "com.jfrog.bintray.gradle:gradle-bintray-plugin:$versions.bintray"
 deps.build = build
 
 /**

dependencies.gradle

@@ -2,6 +2,8 @@ apply plugin: 'com.android.library'
 apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-kapt'
 apply plugin: 'kotlin-android-extensions'
+apply from: "$rootDir/scripts/jfrog.gradle"
+
 
 // Android library configuration
 android {
@@ -70,3 +72,22 @@ dependencies {
     testImplementation deps.test.junit_params
     testRuntimeOnly deps.test.junit_engine
 }
+
+task sourcesJar(type: Jar) {
+    classifier = 'sources'
+    from android.sourceSets.main.java.srcDirs
+}
+
+task javadoc(type: Javadoc) {
+    enabled = false
+}
+
+task javadocJar(type: Jar, dependsOn: javadoc) {
+    classifier = 'javadoc'
+    from javadoc.destinationDir
+}
+
+artifacts {
+    archives javadocJar
+    archives sourcesJar
+}

mvi-valueadd/.gitignore renamed to mvi/.gitignore

@@ -19,3 +19,5 @@
 # If you keep the line number information, uncomment this to
 # hide the original source file name.
 #-renamesourcefileattribute SourceFile
+-keep class pl.valueadd.mvi.** { *; }
+-keepclassmembers class pl.valueadd.mvi.** { *; }