Merge pull request #35 from Omega-R/develop

Master

Author: anton-knyazev

build.gradle

@@ -2,8 +2,8 @@
 plugins {
     id 'com.android.application' version '7.3.0' apply false
     id 'com.android.library' version '7.3.0' apply false
-    id 'org.jetbrains.kotlin.android' version '1.9.0' apply false
-    id 'org.jetbrains.kotlin.jvm' version '1.9.0' apply false
-    id 'com.google.devtools.ksp' version '1.9.0-1.0.11' apply false
+    id 'org.jetbrains.kotlin.android' version '2.0.0' apply false
+    id 'org.jetbrains.kotlin.jvm' version '2.0.0' apply false
+    id 'com.google.devtools.ksp' version '2.0.0-1.0.+' apply false
 
 }

moxy/compiler/build.gradle

@@ -37,11 +37,11 @@ dependencies {
 
     implementation project(":moxy")
 
-    implementation "org.jetbrains.kotlin:kotlin-reflect:1.9.0"
+    implementation "org.jetbrains.kotlin:kotlin-reflect:2.0.0"
 
-    implementation 'com.google.devtools.ksp:symbol-processing-api:1.9.0-1.0.11'
+    implementation 'com.google.devtools.ksp:symbol-processing-api:2.0.0-1.0.+'
 
-    def kotlinPoetVersion = '1.14.2'
+    def kotlinPoetVersion = '1.17.0'
 
     implementation "com.squareup:kotlinpoet:$kotlinPoetVersion"
     implementation "com.squareup:kotlinpoet-metadata:$kotlinPoetVersion"

moxy/compiler/src/main/java/com/omegar/mvp/compiler/processors/ViewStateGenerator.kt

@@ -11,6 +11,7 @@ import com.omegar.mvp.compiler.entities.View.Method.Type.Function
 import com.omegar.mvp.compiler.entities.View.Method.Type.Property
 import com.omegar.mvp.compiler.extensions.safeParameterizedBy
 import com.omegar.mvp.compiler.extensions.toFileSpecBuilder
+import com.omegar.mvp.presenter.PresenterType
 import com.omegar.mvp.viewstate.MvpViewState
 import com.omegar.mvp.viewstate.ViewCommand
 import com.omegar.mvp.viewstate.strategy.AddToEndSingleStrategy
@@ -285,11 +286,15 @@ class ViewStateGenerator : Processor<View, FileSpec> {
         return FunSpec.builder("provide${ if (generalName) "Presenter" else presenterType.simpleName}")
             .receiver(receiver)
             .addTypeVariables(typeParams)
+            .addParameter(ParameterSpec.builder("presenterType",  PresenterType::class)
+                .defaultValue("%T.%L", PresenterType::class.asTypeName(), PresenterType.LOCAL)
+                .build()
+            )
             .addParameter("factoryBlock", lambda)
             .returns(presenterFactoryTypeName)
             .addCode(viewStateClassName.simpleName + ".Companion\n")
             .addStatement("@Suppress(\"UNCHECKED_CAST\")")
-            .addCode("return %T(%T::class as %T<%T>, factoryBlock).also { mvpDelegate.addCustomPresenterFields(it) }", presenterFactoryTypeName, presenterType, KClass::class.asClassName(), parameterizedPresenterType)
+            .addCode("return %T(%T::class as %T<%T>, presenterType, factoryBlock).also { mvpDelegate.addCustomPresenterFields(it) }", presenterFactoryTypeName, presenterType, KClass::class.asClassName(), parameterizedPresenterType)
             .build()
     }
 

moxy/src/main/java/com/omegar/mvp/CustomPresenterFactory.kt

@@ -9,8 +9,8 @@ import kotlin.reflect.KProperty
  * Created by Anton Knyazev on 25.11.2020.
  */
 
-class CustomPresenterFactory<P : MvpPresenter<*>, D>(presenterClass: KClass<P>, private val factoryBlock: () -> P) :
-    PresenterField<D, P>(PresenterType.LOCAL, presenterClass) {
+class CustomPresenterFactory<P : MvpPresenter<*>, D>(presenterClass: KClass<P>, presenterType: PresenterType = PresenterType.LOCAL, private val factoryBlock: () -> P) :
+    PresenterField<D, P>(presenterType, presenterClass) {
 
     private var presenter: P? = null