Merge pull request #48 from Omega-R/develop

Develop to master

Author: KsenyaBol

.idea/codeStyles/codeStyleConfig.xml

@@ -1,16 +1,14 @@
 apply plugin: 'com.android.library'
 apply plugin: 'kotlin-android'
-apply plugin: 'com.github.dcendents.android-maven'
 
-group = 'com.github.Omega-R.OmegaBase'
 
 
 android {
-    compileSdkVersion 30
+    compileSdkVersion 31
 
     defaultConfig {
         minSdkVersion 16
-        targetSdkVersion 30
+        targetSdkVersion 31
         versionCode 1
         versionName "1.0"
 

.idea/compiler.xml

@@ -1,9 +1,38 @@
 apply plugin: 'kotlin'
-apply plugin: 'com.github.dcendents.android-maven'
-group = 'com.github.Omega-R.OmegaBase'
-
-dependencies {
-    implementation fileTree(dir: 'libs', include: ['*.jar'])
-    //noinspection DifferentStdlibGradleVersion
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
-}
+apply plugin: 'maven-publish'
+
+
+java {
+    sourceCompatibility = JavaVersion.VERSION_1_8
+    targetCompatibility = JavaVersion.VERSION_1_8
+}
+
+publishing {
+    publications {
+        release(MavenPublication) {
+            groupId = 'com.github.Omega-R.OmegaBase'
+            artifactId = 'annotations'
+            version project.hasProperty('version') ? project.version : gradle.gitHash()
+
+            afterEvaluate {
+                from components.java
+            }
+        }
+    }
+    repositories {
+        maven {
+            url gradle.nexusUrl
+            credentials {
+                username gradle.nexusUsername
+                password gradle.nexusPassword
+            }
+        }
+    }
+
+    dependencies {
+        implementation fileTree(dir: 'libs', include: ['*.jar'])
+        implementation "org.jetbrains.kotlin:kotlin-reflect"
+        //noinspection DifferentStdlibGradleVersion
+    }
+
+}

.idea/gradle.xml

@@ -0,0 +1,10 @@
+package com.omega_r.base.annotations
+
+import kotlin.reflect.KClass
+
+@Retention(AnnotationRetention.SOURCE)
+@Target(allowedTargets = [AnnotationTarget.CLASS])
+annotation class AutoPresenterLauncher(
+    vararg val delegatedClass: KClass<*>,
+    val localPresenterType: Boolean = true,
+)

.idea/misc.xml

@@ -1,14 +1,15 @@
 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 31
+    compileSdkVersion 33
     defaultConfig {
         applicationId "com.omega_r.omegabase.simple"
         multiDexEnabled true
-        minSdkVersion 16
+        minSdkVersion 21
         targetSdkVersion 31
         versionCode 1
         versionName "1.0"
@@ -26,6 +27,7 @@ android {
         pickFirst 'META-INF/atomicfu.kotlin_module'
         pickFirst 'META-INF/kotlinx-coroutines-io.kotlin_module'
         pickFirst 'META-INF/library_release.kotlin_module'
+        pickFirst 'META-INF/core_release.kotlin_module'
     }
 
 
@@ -38,28 +40,34 @@ android {
 
 }
 
+kotlin {
+    sourceSets {
+        main.kotlin.srcDirs += 'build/generated/ksp/debug/kotlin'
+    }
+}
+
 dependencies {
     implementation fileTree(include: ['*.jar'], dir: 'libs')
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:${kotlin_version}"
-    implementation 'androidx.appcompat:appcompat:1.1.0'
-    implementation 'androidx.core:core-ktx:1.2.0-rc01'
+    implementation 'androidx.appcompat:appcompat:1.4.0'
+    implementation 'androidx.core:core-ktx:1.7.0'
     implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:${kotlinCorutines_version}"
     implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:${kotlinCorutines_version}"
-    implementation 'androidx.constraintlayout:constraintlayout:2.0.0-beta3'
+    implementation 'androidx.constraintlayout:constraintlayout:2.2.0-alpha04'
     implementation 'androidx.recyclerview:recyclerview:1.2.1'
     implementation "com.github.Omega-R.OmegaRecyclerView:omegarecyclerview:${omegaRecyclerView}"
 
     implementation project(':core')
-    implementation project(':crash')
 
-    kapt 'com.github.Omega-R.OmegaMoxy:moxy-compiler:2.2.0'
+    ksp "com.github.Omega-R.OmegaMoxy:moxy-compiler:${omegaMoxy_version}"
     kapt project(':processor')
 
     implementation 'com.github.bumptech.glide:glide:4.9.0'
 
     testImplementation 'junit:junit:4.13-beta-3'
     androidTestImplementation 'androidx.test:runner:1.3.0-alpha02'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0-alpha02'
+    implementation 'com.google.android.material:material:1.5.0-beta01'
 
+    ksp project(":mvp-processor")
 
 }

.idea/vcs.xml

@@ -13,7 +13,11 @@
             android:supportsRtl="true"
             android:name=".SampleApp"
             android:theme="@style/AppTheme">
-        <activity android:name="com.omega_r.base.simple.MainActivity">
+
+        <meta-data android:name="CRASH_SENDER_EMAIL" android:value="[email protected]"/>
+
+        <activity android:name="com.omega_r.base.simple.MainActivity"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN"/>