From 9aeb0aec9a0a441ee857edaf86e483cb18ce30f3 Mon Sep 17 00:00:00 2001 From: roman_tcaregorodtcev Date: Wed, 9 Oct 2019 11:58:32 +0300 Subject: [PATCH] Gradle updated; IncrementalAnnotationProcessor annotation added --- build.gradle | 31 +++++++++++-------- gradle/wrapper/gradle-wrapper.properties | 4 +-- moxy-androidx-sample/build.gradle | 2 +- .../com/moxy_androidx_sample/BaseView.java | 3 ++ .../moxy_androidx_sample/fifth/Contract.java | 4 +++ .../moxy_androidx_sample/first/FirstView.java | 4 +++ .../moxy_androidx_sample/fourth/FourthView.kt | 3 ++ .../second/SecondView.java | 4 +++ .../moxy_androidx_sample/third/ThirdView.java | 4 +++ moxy-compiler/build.gradle | 5 ++- .../com/omegar/mvp/compiler/MvpCompiler.java | 6 ++-- 11 files changed, 51 insertions(+), 19 deletions(-) diff --git a/build.gradle b/build.gradle index c65ae264..8faa5f89 100644 --- a/build.gradle +++ b/build.gradle @@ -7,7 +7,7 @@ buildscript { google() } dependencies { - classpath 'com.android.tools.build:gradle:3.3.2' + classpath 'com.android.tools.build:gradle:3.4.1' classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1' } } @@ -24,20 +24,25 @@ allprojects { ext { targetVersionCode = 46 targetVersionName = "1.5.6" - kotlin_version = '1.3.41' + kotlin_version = '1.3.50' + def autoServiceVersion = '1.0-rc5' + def gradleIncapHelperVersion = '0.2' deps = [ - android : 'com.google.android:android:1.6_r2', - javapoet : 'com.squareup:javapoet:1.10.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.15', - asm : ['org.ow2.asm:asm:6.0', 'org.ow2.asm:asm-util:6.0'], - autoservice : 'com.google.auto.service:auto-service:1.0-rc4', - autocommon : 'com.google.auto:auto-common:0.10', - guava : 'com.google.guava:guava:21.0', + android : 'com.google.android:android:1.6_r2', + javapoet : 'com.squareup:javapoet:1.10.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.15', + asm : ['org.ow2.asm:asm:6.0', 'org.ow2.asm:asm-util:6.0'], + autoservice : "com.google.auto.service:auto-service:$autoServiceVersion", + autoserviceAnnotations : "com.google.auto.service:auto-service-annotations:$autoServiceVersion", + autocommon : 'com.google.auto:auto-common:0.10', + guava : 'com.google.guava:guava:21.0', + gradleIncapHelperAnnotations: "net.ltgt.gradle.incap:incap:$gradleIncapHelperVersion", + gradleIncapHelperProcessor : "net.ltgt.gradle.incap:incap-processor:$gradleIncapHelperVersion" ] } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index ee04ff52..fd97bee2 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Thu Mar 21 17:43:47 MSK 2019 +#Wed Oct 09 11:52:42 MSK 2019 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-5.1.1-all.zip diff --git a/moxy-androidx-sample/build.gradle b/moxy-androidx-sample/build.gradle index 1c76fae2..64f4375c 100644 --- a/moxy-androidx-sample/build.gradle +++ b/moxy-androidx-sample/build.gradle @@ -40,7 +40,7 @@ android { } dependencies { - implementation 'androidx.appcompat:appcompat:1.0.2' + implementation 'androidx.appcompat:appcompat:1.1.0' implementation project(':moxy') implementation project(':moxy-androidx') kapt project(':moxy-compiler') diff --git a/moxy-androidx-sample/src/main/kotlin/example/com/moxy_androidx_sample/BaseView.java b/moxy-androidx-sample/src/main/kotlin/example/com/moxy_androidx_sample/BaseView.java index 60e2928e..4b812536 100644 --- a/moxy-androidx-sample/src/main/kotlin/example/com/moxy_androidx_sample/BaseView.java +++ b/moxy-androidx-sample/src/main/kotlin/example/com/moxy_androidx_sample/BaseView.java @@ -1,7 +1,10 @@ package example.com.moxy_androidx_sample; import com.omegar.mvp.MvpView; +import com.omegar.mvp.viewstate.strategy.AddToEndSingleStrategy; +import com.omegar.mvp.viewstate.strategy.StateStrategyType; +@StateStrategyType(AddToEndSingleStrategy.class) public interface BaseView extends MvpView { void testFunction(); diff --git a/moxy-androidx-sample/src/main/kotlin/example/com/moxy_androidx_sample/fifth/Contract.java b/moxy-androidx-sample/src/main/kotlin/example/com/moxy_androidx_sample/fifth/Contract.java index 6a7efbde..db10d24b 100644 --- a/moxy-androidx-sample/src/main/kotlin/example/com/moxy_androidx_sample/fifth/Contract.java +++ b/moxy-androidx-sample/src/main/kotlin/example/com/moxy_androidx_sample/fifth/Contract.java @@ -1,9 +1,13 @@ package example.com.moxy_androidx_sample.fifth; +import com.omegar.mvp.viewstate.strategy.AddToEndSingleStrategy; +import com.omegar.mvp.viewstate.strategy.StateStrategyType; + import example.com.moxy_androidx_sample.fourth.FourthView; public interface Contract { + @StateStrategyType(AddToEndSingleStrategy.class) interface FifthView extends FourthView { } diff --git a/moxy-androidx-sample/src/main/kotlin/example/com/moxy_androidx_sample/first/FirstView.java b/moxy-androidx-sample/src/main/kotlin/example/com/moxy_androidx_sample/first/FirstView.java index 141b5eee..81c3b81c 100644 --- a/moxy-androidx-sample/src/main/kotlin/example/com/moxy_androidx_sample/first/FirstView.java +++ b/moxy-androidx-sample/src/main/kotlin/example/com/moxy_androidx_sample/first/FirstView.java @@ -2,11 +2,15 @@ import android.location.Location; +import com.omegar.mvp.viewstate.strategy.AddToEndSingleStrategy; +import com.omegar.mvp.viewstate.strategy.StateStrategyType; + import java.util.List; import example.com.moxy_androidx_sample.BaseView; import example.com.moxy_androidx_sample.third.ThirdView; +@StateStrategyType(AddToEndSingleStrategy.class) public interface FirstView extends BaseView, ThirdView { void firstMethod(List item); diff --git a/moxy-androidx-sample/src/main/kotlin/example/com/moxy_androidx_sample/fourth/FourthView.kt b/moxy-androidx-sample/src/main/kotlin/example/com/moxy_androidx_sample/fourth/FourthView.kt index 07156bc0..fe88665b 100644 --- a/moxy-androidx-sample/src/main/kotlin/example/com/moxy_androidx_sample/fourth/FourthView.kt +++ b/moxy-androidx-sample/src/main/kotlin/example/com/moxy_androidx_sample/fourth/FourthView.kt @@ -1,7 +1,10 @@ package example.com.moxy_androidx_sample.fourth +import com.omegar.mvp.viewstate.strategy.AddToEndSingleStrategy +import com.omegar.mvp.viewstate.strategy.StateStrategyType import example.com.moxy_androidx_sample.BaseView +@StateStrategyType(AddToEndSingleStrategy::class) interface FourthView : BaseView { fun fourth(item: R) diff --git a/moxy-androidx-sample/src/main/kotlin/example/com/moxy_androidx_sample/second/SecondView.java b/moxy-androidx-sample/src/main/kotlin/example/com/moxy_androidx_sample/second/SecondView.java index bd9c0ecf..30b4c0da 100644 --- a/moxy-androidx-sample/src/main/kotlin/example/com/moxy_androidx_sample/second/SecondView.java +++ b/moxy-androidx-sample/src/main/kotlin/example/com/moxy_androidx_sample/second/SecondView.java @@ -1,7 +1,11 @@ package example.com.moxy_androidx_sample.second; +import com.omegar.mvp.viewstate.strategy.AddToEndSingleStrategy; +import com.omegar.mvp.viewstate.strategy.StateStrategyType; + import example.com.moxy_androidx_sample.BaseView; +@StateStrategyType(AddToEndSingleStrategy.class) public interface SecondView extends BaseView { void secondMethod(); diff --git a/moxy-androidx-sample/src/main/kotlin/example/com/moxy_androidx_sample/third/ThirdView.java b/moxy-androidx-sample/src/main/kotlin/example/com/moxy_androidx_sample/third/ThirdView.java index ab5a10c6..766ccaf4 100644 --- a/moxy-androidx-sample/src/main/kotlin/example/com/moxy_androidx_sample/third/ThirdView.java +++ b/moxy-androidx-sample/src/main/kotlin/example/com/moxy_androidx_sample/third/ThirdView.java @@ -1,7 +1,11 @@ package example.com.moxy_androidx_sample.third; +import com.omegar.mvp.viewstate.strategy.AddToEndSingleStrategy; +import com.omegar.mvp.viewstate.strategy.StateStrategyType; + import example.com.moxy_androidx_sample.BaseView; +@StateStrategyType(AddToEndSingleStrategy.class) public interface ThirdView extends BaseView { void thirdMethod(); diff --git a/moxy-compiler/build.gradle b/moxy-compiler/build.gradle index 308ba770..286503f3 100644 --- a/moxy-compiler/build.gradle +++ b/moxy-compiler/build.gradle @@ -251,8 +251,11 @@ dependencies { implementation deps.javapoet compileOnly deps.autocommon - compileOnly deps.autoservice + compileOnly deps.autoserviceAnnotations + annotationProcessor deps.autoservice compileOnly deps.guava + compileOnly deps.gradleIncapHelperAnnotations + annotationProcessor deps.gradleIncapHelperProcessor javadocDeps project(':moxy') javadocDeps deps.javapoet diff --git a/moxy-compiler/src/main/java/com/omegar/mvp/compiler/MvpCompiler.java b/moxy-compiler/src/main/java/com/omegar/mvp/compiler/MvpCompiler.java index c2eed972..fdcc06bf 100644 --- a/moxy-compiler/src/main/java/com/omegar/mvp/compiler/MvpCompiler.java +++ b/moxy-compiler/src/main/java/com/omegar/mvp/compiler/MvpCompiler.java @@ -14,6 +14,9 @@ import com.omegar.mvp.presenter.InjectPresenter; import com.squareup.javapoet.JavaFile; +import net.ltgt.gradle.incap.IncrementalAnnotationProcessor; +import net.ltgt.gradle.incap.IncrementalAnnotationProcessorType; + import java.io.IOException; import java.lang.annotation.Annotation; import java.util.ArrayList; @@ -22,8 +25,6 @@ import java.util.List; import java.util.Map; import java.util.Set; -import java.util.stream.Collectors; -import java.util.stream.Stream; import javax.annotation.processing.AbstractProcessor; import javax.annotation.processing.Messager; @@ -50,6 +51,7 @@ @SuppressWarnings("unused") @AutoService(Processor.class) +@IncrementalAnnotationProcessor(IncrementalAnnotationProcessorType.AGGREGATING) public class MvpCompiler extends AbstractProcessor { public static final String MOXY_REFLECTOR_DEFAULT_PACKAGE = "com.omegar.mvp";