Merge branch 'release/1.5.4'

Author: Yurj Shmakov

README.md

@@ -76,33 +76,33 @@ Base modules integration:
 ```groovy
 dependencies {
   ...
-  compile 'com.arello-mobile:moxy:1.5.3'
-  annotationProcessor 'com.arello-mobile:moxy-compiler:1.5.3'
+  compile 'com.arello-mobile:moxy:1.5.4'
+  annotationProcessor 'com.arello-mobile:moxy-compiler:1.5.4'
 }
 ```
 For additional base view classes `MvpActivity` and `MvpFragment` add this:
 ```groovy
 dependencies {
   ...
-  compile 'com.arello-mobile:moxy-android:1.5.3'
+  compile 'com.arello-mobile:moxy-android:1.5.4'
 }
 ```
 If you are planning to use AppCompat, then you can use `MvpAppCompatActivity` and `MvpAppCompatFragment`. Then add this:
 ```groovy
 dependencies {
   ...
-  compile 'com.arello-mobile:moxy-app-compat:1.5.3'
+  compile 'com.arello-mobile:moxy-app-compat:1.5.4'
   compile 'com.android.support:appcompat-v7:$support_version'
 }
 ```
 ### Kotlin
-If you are using kotlin, use `kapt` instead of `provided`/`apt` dependency type and add `kotlin-kapt` plugin:
+If you are using kotlin, use `kapt` instead of `provided`/`apt` dependency type:
 ```groovy
 apply plugin: 'kotlin-kapt'
 
 dependencies {
   ...
-  kapt 'com.arello-mobile:moxy-compiler:1.5.3'
+  kapt 'com.arello-mobile:moxy-compiler:1.5.4'
 }
 ```
 

build.gradle

@@ -21,8 +21,22 @@ allprojects {
 }
 
 ext {
-    targetVersionCode = 43
-    targetVersionName = "1.5.3"
+    targetVersionCode = 44
+    targetVersionName = "1.5.4"
+
+    deps = [
+            android       : 'com.google.android:android:1.6_r2',
+            javapoet      : 'com.squareup:javapoet:1.9.0',
+            junit         : 'junit:junit:4.12',
+            mockito       : 'org.mockito:mockito-core:1.10.19',
+            truth         : 'com.google.truth:truth:0.34',
+            robolectric   : 'org.robolectric:robolectric:3.0',
+            compiletesting: 'com.google.testing.compile:compile-testing:0.11',
+            asm           : ['org.ow2.asm:asm:6.0', 'org.ow2.asm:asm-util:6.0'],
+            autoservice   : 'com.google.auto.service:auto-service:1.0-rc3',
+            autocommon    : 'com.google.auto:auto-common:0.8',
+            guava         : 'com.google.guava:guava:21.0',
+    ]
 }
 
 task clean(type: Delete) {

moxy-android/build.gradle

@@ -234,10 +234,11 @@ assemble.dependsOn copyVersion
 
 dependencies {
     compile project(':moxy')
-    runtime project(':moxy')
-    javadocDeps project(':moxy')
-    compileOnly 'com.google.android:android:1.6_r2'
-    javadocDeps 'com.google.android:android:1.6_r2'
+
+    compileOnly deps.android
     compileOnly project(':stub-android')
+
+    javadocDeps project(':moxy')
+    javadocDeps deps.android
     javadocDeps project(':stub-android')
 }

moxy-android/stub-android/build.gradle

@@ -4,5 +4,5 @@ sourceCompatibility = JavaVersion.VERSION_1_7
 targetCompatibility = JavaVersion.VERSION_1_7
 
 dependencies {
-    compileOnly 'com.google.android:android:1.6_r2'
+    compileOnly deps.android
 }

moxy-app-compat/build.gradle

@@ -232,10 +232,11 @@ assemble.dependsOn copyVersion
 
 dependencies {
     compile project(':moxy')
-    runtime project(':moxy')
-    javadocDeps project(':moxy')
-    compileOnly 'com.google.android:android:2.1_r1'
-    javadocDeps 'com.google.android:android:2.1_r1'
+
+    compileOnly deps.android
     compileOnly project(':stub-appcompat')
+
+    javadocDeps project(':moxy')
+    javadocDeps deps.android
     javadocDeps project(':stub-appcompat')
 }

moxy-app-compat/stub-appcompat/build.gradle

@@ -4,5 +4,5 @@ sourceCompatibility = JavaVersion.VERSION_1_7
 targetCompatibility = JavaVersion.VERSION_1_7
 
 dependencies {
-    compileOnly 'com.google.android:android:1.5_r3'
+    compileOnly deps.android
 }

moxy-compiler/build.gradle

@@ -14,10 +14,8 @@ configurations {
     javadocDeps
 }
 
-// This is important even if Android Studio claims it isn't
-// used. Android can't interpret Java 8 byte code.
-sourceCompatibility = JavaVersion.VERSION_1_7
-targetCompatibility = JavaVersion.VERSION_1_7
+sourceCompatibility = JavaVersion.VERSION_1_8
+targetCompatibility = JavaVersion.VERSION_1_8
 
 task clearPublishDir(type: Delete) {
     delete publishDir
@@ -247,10 +245,21 @@ assemble.dependsOn copyVersion
 
 dependencies {
     compile project(':moxy')
-    runtime project(':moxy')
+    compile deps.javapoet
+
+    compileOnly deps.autocommon
+    compileOnly deps.autoservice
+    compileOnly deps.guava
+
     javadocDeps project(':moxy')
-    javadocDeps 'com.squareup:javapoet:1.0.0'
-    javadocDeps 'com.google.auto.service:auto-service:1.0-rc2'
-    compile 'com.google.auto.service:auto-service:1.0-rc2'
-    compile 'com.squareup:javapoet:1.0.0'
+    javadocDeps deps.javapoet
+    javadocDeps deps.autoservice
+
+    testCompile deps.junit
+    testCompile deps.truth
+    testCompile deps.compiletesting
+    testCompile deps.asm
+
+    // workaround to use test resources (https://stackoverflow.com/q/24870464)
+    testRuntime files(sourceSets.test.output.resourcesDir)
 }

moxy-compiler/src/main/java/com/arellomobile/mvp/compiler/ClassGeneratingParams.java

@@ -0,0 +1,13 @@
+package com.arellomobile.mvp.compiler;
+
+import javax.lang.model.element.Element;
+
+/**
+ * Date: 27-Jul-17
+ * Time: 10:31
+ *
+ * @author Evgeny Kursakov
+ */
+public abstract class ElementProcessor<E extends Element, R> {
+	public abstract R process(E element);
+}