Merge pull request #34 from Omega-R/develop

Develop

Author: anton-knyazev

.gitignore

@@ -11,3 +11,5 @@
 /build
 /captures
 .externalNativeBuild
+lib/build/generated
+lib/build

.idea/codeStyles/Project.xml

@@ -0,0 +1,9 @@
+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"
+}

.idea/dictionaries/R12.xml

@@ -0,0 +1,5 @@
+package com.omega_r.base.annotations
+
+@Retention(AnnotationRetention.SOURCE)
+@Target(allowedTargets = [AnnotationTarget.CLASS])
+annotation class AppOmegaRepository

.idea/dictionaries/antonknyazev.xml

@@ -7,6 +7,7 @@ android {
     compileSdkVersion 28
     defaultConfig {
         applicationId "com.omega_r.omegabase.simple"
+        multiDexEnabled true
         minSdkVersion 14
         targetSdkVersion 28
         versionCode 1
@@ -39,18 +40,22 @@ android {
 dependencies {
     implementation fileTree(include: ['*.jar'], dir: 'libs')
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:${kotlin_version}"
-    implementation 'androidx.appcompat:appcompat:1.1.0-alpha05'
-    implementation 'androidx.core:core-ktx:1.1.0-beta01'
+    implementation 'androidx.appcompat:appcompat:1.1.0'
+    implementation 'androidx.core:core-ktx:1.2.0-rc01'
     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-alpha5'
-    testImplementation 'junit:junit:4.13-beta-3'
-    androidTestImplementation 'androidx.test:runner:1.2.0-beta01'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0-beta01'
-    implementation project(':lib')
-    kapt 'com.github.Omega-R.OmegaMoxy:moxy-compiler:1.7.0'
+    implementation 'androidx.constraintlayout:constraintlayout:2.0.0-beta3'
+    implementation 'androidx.recyclerview:recyclerview:1.1.0'
+
+    implementation project(':core')
+    kapt 'com.github.Omega-R.OmegaMoxy:moxy-compiler:1.7.1'
+    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'
 
 
 }