Upgrade OmegaMoxy

anton-knyazev · anton-knyazev · commit 768b85c990be · 2023-10-05T16:12:32.000+03:00
diff --git a/.idea/codeStyles/codeStyleConfig.xml b/.idea/codeStyles/codeStyleConfig.xml
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
diff --git a/app/build.gradle b/app/build.gradle
@@ -1,8 +1,8 @@
 apply plugin: 'com.android.application'
 apply plugin: 'kotlin-android'
-apply plugin: 'kotlin-android-extensions'
 apply plugin: 'kotlin-kapt'
 apply plugin: 'com.google.devtools.ksp'
+apply plugin: 'kotlin-parcelize'
 
 android {
     compileSdkVersion 33
@@ -58,7 +58,7 @@ dependencies {
 
     implementation project(':core')
 
-    kapt "com.github.Omega-R.OmegaMoxy:moxy-compiler:${omegaMoxy_version}"
+    ksp "com.github.Omega-R.OmegaMoxy:moxy-compiler:${omegaMoxy_version}"
     kapt project(':processor')
 
     implementation 'com.github.bumptech.glide:glide:4.9.0'
diff --git a/app/src/main/java/com/omega_r/base/simple/MainActivity.kt b/app/src/main/java/com/omega_r/base/simple/MainActivity.kt
@@ -56,7 +56,7 @@ class MainActivity : OmegaActivity(R.layout.activity_main), MainView {
     }
 
     private val maps: Map<Field, View> by bind(Field.values()) {
-        showToast(Text.from(it.id.toString()))
+        //showToast(Text.from(it.id.toString()))
     }
 
     override var list: String = ""
diff --git a/app/src/main/java/com/omega_r/base/simple/MainPresenter.kt b/app/src/main/java/com/omega_r/base/simple/MainPresenter.kt
@@ -4,13 +4,15 @@ import android.os.SystemClock
 import com.omega_r.base.annotations.AutoPresenterLauncher
 import com.omega_r.base.mvp.presenters.OmegaPresenter
 import com.omega_r.libs.omegatypes.Text
+import com.omegar.mvp.InjectViewState
 import java.io.Serializable
 
 /**
  * Created by Anton Knyazev on 06.05.19.
  */
 typealias TestEntity2 = TestEntity
 @AutoPresenterLauncher(MainActivity::class, TestFragment::class)
+@InjectViewState
 class MainPresenter(testEntity: TestEntity?, t2: TestEntity2?): OmegaPresenter<MainView>() {
 
     companion object {
@@ -23,11 +25,13 @@ class MainPresenter(testEntity: TestEntity?, t2: TestEntity2?): OmegaPresenter<M
         lastTime = SystemClock.elapsedRealtime()
 
         if (testEntity == null) {
+//            MainActivity::class.createLauncher(testEntity, t2).launch()
             MainPresenterFactory.createMainActivityLauncher(TestEntity(), TestEntity()).launch()
         } else {
             println("TestAnt: $time")
+            viewState.showToast(Text.from(time.toString()))
+
         }
-        viewState.showToast(Text.from(System.getProperty("http.agent")))
         viewState.enabled = false
 //        launch {
 //            try {
diff --git a/app/src/main/java/com/omega_r/base/simple/TestEntity.kt b/app/src/main/java/com/omega_r/base/simple/TestEntity.kt
@@ -1,13 +1,11 @@
 package com.omega_r.base.simple
 
-import android.os.Parcel
 import android.os.Parcelable
-import android.os.Parcelable.Creator
-import kotlinx.android.parcel.Parcelize
+import kotlinx.parcelize.Parcelize
 import java.io.Serializable
 
 @Parcelize
-class TestEntity() : Parcelable, Serializable {
+class TestEntity : Parcelable, Serializable {
 
 
 }
diff --git a/app/src/main/java/com/omega_r/base/simple/dialog_fragment/DialogDialogFragment.kt b/app/src/main/java/com/omega_r/base/simple/dialog_fragment/DialogDialogFragment.kt
@@ -6,7 +6,7 @@ import com.omega_r.base.components.OmegaDialogFragment
 import com.omega_r.base.simple.R
 import com.omega_r.libs.omegatypes.Text
 import com.omegar.libs.omegalaunchers.createDialogFragmentLauncher
-import com.omegar.mvp.presenter.InjectPresenter
+import com.omegar.mvp.ktx.providePresenter
 
 /**
  * Created by Anton Knyazev on 10.03.2020.
@@ -18,8 +18,9 @@ class DialogDialogFragment : OmegaDialogFragment(), DialogView {
         fun createLauncher() = createDialogFragmentLauncher()
     }
 
-    @InjectPresenter
-    override lateinit var presenter: DialogPresenter
+    override val presenter: DialogPresenter by providePresenter {
+        DialogPresenter()
+    }
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
diff --git a/app/src/main/java/com/omega_r/base/simple/dialog_fragment/DialogPresenter.kt b/app/src/main/java/com/omega_r/base/simple/dialog_fragment/DialogPresenter.kt
@@ -1,10 +1,12 @@
 package com.omega_r.base.simple.dialog_fragment
 
 import com.omega_r.base.mvp.presenters.OmegaPresenter
+import com.omegar.mvp.InjectViewState
 
 /**
  * Created by Anton Knyazev on 10.03.2020.
  */
+@InjectViewState
 class DialogPresenter : OmegaPresenter<DialogView>() {
 
 }
diff --git a/build.gradle b/build.gradle
@@ -1,7 +1,7 @@
 buildscript {
     ext {
         omegaRecyclerView = '1.10.0'
-        omegaMoxy_version = 'ac9b694b'
+        omegaMoxy_version = 'fa92b335a3'
         kotlinCorutines_version = '1.5.0'
 
     }// Top-level build file where you can add configuration options common to all sub-projects/modules.
@@ -12,9 +12,9 @@ buildscript {
 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.7.21' apply false
-    id 'org.jetbrains.kotlin.jvm' version '1.7.21' apply false
-    id 'com.google.devtools.ksp' version '1.7.21-1.0.8' 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
 
 }
 
diff --git a/core/build.gradle b/core/build.gradle
@@ -1,7 +1,7 @@
 apply plugin: 'com.android.library'
 apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-kapt'
-apply plugin: 'kotlin-android-extensions'
+apply plugin: 'com.google.devtools.ksp'
 
 apply plugin: 'maven-publish'
 
@@ -50,10 +50,6 @@ android {
         }
     }
 
-    androidExtensions {
-        experimental = true
-    }
-
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_8
         targetCompatibility JavaVersion.VERSION_1_8
@@ -66,6 +62,9 @@ android {
             arg("moxyReflectorPackage", 'com.omega_r.base')
         }
     }
+    ksp {
+        arg("moxyReflectorPackage", 'com.omega_r.base')
+    }
 }
 
 
@@ -82,7 +81,7 @@ dependencies {
 
     api "com.github.Omega-R.OmegaMoxy:moxy:${omegaMoxy_version}"
     api "com.github.Omega-R.OmegaMoxy:moxy-androidx:${omegaMoxy_version}"
-    kapt "com.github.Omega-R.OmegaMoxy:moxy-compiler:${omegaMoxy_version}"
+    ksp "com.github.Omega-R.OmegaMoxy:moxy-compiler:${omegaMoxy_version}"
 
 
     api "com.github.Omega-R.OmegaRecyclerView:omegarecyclerview:${omegaRecyclerView}@aar"
diff --git a/core/src/main/java/com/omega_r/base/mvp/presenters/OmegaPresenter.kt b/core/src/main/java/com/omega_r/base/mvp/presenters/OmegaPresenter.kt
@@ -14,6 +14,7 @@ import com.omegar.libs.omegalaunchers.ActivityLauncher
 import com.omegar.libs.omegalaunchers.BaseIntentLauncher
 import com.omegar.libs.omegalaunchers.DialogFragmentLauncher
 import com.omegar.libs.omegalaunchers.Launcher
+import com.omegar.mvp.InjectViewState
 import com.omegar.mvp.MvpPresenter
 import kotlinx.coroutines.*
 import java.io.PrintWriter
@@ -29,6 +30,7 @@ import kotlin.coroutines.EmptyCoroutineContext
 private const val REQUEST_PERMISSION_BASE = 10000
 private const val REQUEST_CODE_MAX: Int = Int.MAX_VALUE - 1
 
+@InjectViewState
 open class OmegaPresenter<View : OmegaView> : MvpPresenter<View>(), CoroutineScope {
 
     companion object {
diff --git a/gradle.properties b/gradle.properties
@@ -1,24 +1,21 @@
-# Project-wide Gradle settings.
-# IDE (e.g. Android Studio) users:
-# Gradle settings configured through the IDE *will override*
-# any settings specified in this file.
-# For more details on how to configure your build environment visit
+## For more details on how to configure your build environment visit
 # http://www.gradle.org/docs/current/userguide/build_environment.html
+#
 # Specifies the JVM arguments used for the daemon process.
 # The setting is particularly useful for tweaking memory settings.
-org.gradle.jvmargs=-Xmx1536m
+# Default value: -Xmx1024m -XX:MaxPermSize=256m
+# org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
+#
 # When configured, Gradle will run in incubating parallel mode.
 # This option should only be used with decoupled projects. More details, visit
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
 # org.gradle.parallel=true
-# AndroidX package structure to make it clearer which packages are bundled with the
-# Android operating system, and which are packaged with your app's APK
-# https://developer.android.com/topic/libraries/support-library/androidx-rn
-android.useAndroidX=true
-# Automatically convert third-party libraries to use AndroidX
+#Thu Oct 05 14:53:44 MSK 2023
+android.disableAutomaticComponentCreation=true
 android.enableJetifier=true
-# Kotlin code style for this project: "official" or "obsolete":
-kotlin.code.style=official
+android.useAndroidX=true
 kapt.incremental.apt=true
+kotlin.code.style=official
 kotlin.incremental=true
-android.disableAutomaticComponentCreation=true
+org.gradle.jvmargs=-Xmx2048M -Dkotlin.daemon.jvm.options\="-Xmx1536M"
+org.gradle.unsafe.configuration-cache=true
diff --git a/mvp-processor/build.gradle b/mvp-processor/build.gradle
@@ -36,9 +36,9 @@ java {
 dependencies {
     implementation project(path: ':annotations')
 
-    implementation 'com.google.devtools.ksp:symbol-processing-api:1.7.21-1.0.8'
+    implementation 'com.google.devtools.ksp:symbol-processing-api:1.9.0-1.0.11'
 
-    implementation("com.squareup:kotlinpoet:1.12.0")
-    implementation("com.squareup:kotlinpoet-ksp:1.12.0")
+    implementation("com.squareup:kotlinpoet:1.14.2")
+    implementation("com.squareup:kotlinpoet-ksp:1.14.2")
 
 }
diff --git a/mvp-processor/src/main/java/com/omegar/mvp_processor/MvpProcessor.kt b/mvp-processor/src/main/java/com/omegar/mvp_processor/MvpProcessor.kt
diff --git a/processor/build.gradle b/processor/build.gradle

Original file line number	Diff line number	Diff line change
`@@ -56,7 +56,7 @@ class MainActivity : OmegaActivity(R.layout.activity_main), MainView {`
`56`	`56`	`}`
`57`	`57`
`58`	`58`	`private val maps: Map<Field, View> by bind(Field.values()) {`
`59`		`- showToast(Text.from(it.id.toString()))`
	`59`	`+ //showToast(Text.from(it.id.toString()))`
`60`	`60`	`}`
`61`	`61`
`62`	`62`	`override var list: String = ""`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`apply plugin: 'com.android.library'`
`2`	`2`	`apply plugin: 'kotlin-android'`
`3`	`3`	`apply plugin: 'kotlin-kapt'`
`4`		`-apply plugin: 'kotlin-android-extensions'`
	`4`	`+apply plugin: 'com.google.devtools.ksp'`
`5`	`5`
`6`	`6`	`apply plugin: 'maven-publish'`
`7`	`7`
`@@ -50,10 +50,6 @@ android {`
`50`	`50`	`}`
`51`	`51`	`}`
`52`	`52`
`53`		`- androidExtensions {`
`54`		`- experimental = true`
`55`		`- }`
`56`		`-`
`57`	`53`	`compileOptions {`
`58`	`54`	`sourceCompatibility JavaVersion.VERSION_1_8`
`59`	`55`	`targetCompatibility JavaVersion.VERSION_1_8`
`@@ -66,6 +62,9 @@ android {`
`66`	`62`	`arg("moxyReflectorPackage", 'com.omega_r.base')`
`67`	`63`	`}`
`68`	`64`	`}`
	`65`	`+ ksp {`
	`66`	`+ arg("moxyReflectorPackage", 'com.omega_r.base')`
	`67`	`+ }`
`69`	`68`	`}`
`70`	`69`
`71`	`70`
`@@ -82,7 +81,7 @@ dependencies {`
`82`	`81`
`83`	`82`	`api "com.github.Omega-R.OmegaMoxy:moxy:${omegaMoxy_version}"`
`84`	`83`	`api "com.github.Omega-R.OmegaMoxy:moxy-androidx:${omegaMoxy_version}"`
`85`		`- kapt "com.github.Omega-R.OmegaMoxy:moxy-compiler:${omegaMoxy_version}"`
	`84`	`+ ksp "com.github.Omega-R.OmegaMoxy:moxy-compiler:${omegaMoxy_version}"`
`86`	`85`
`87`	`86`
`88`	`87`	`api "com.github.Omega-R.OmegaRecyclerView:omegarecyclerview:${omegaRecyclerView}@aar"`