Merge pull request #6 from mncinnovation/dev

Dev
mncinnovation · Feb 17, 2022 · e353eb6 · e353eb6
2 parents 7a6736d + b56a649
commit e353eb6
Show file tree

Hide file tree

Showing 12 changed files with 50 additions and 37 deletions.
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/app/build.gradle b/app/build.gradle
@@ -6,13 +6,12 @@ plugins {
 }
 
 android {
-    compileSdkVersion 30
-    buildToolsVersion "29.0.3"
+    compileSdkVersion 31
 
     defaultConfig {
         applicationId "com.mncgroup.mnccore"
         minSdkVersion 21
-        targetSdkVersion 30
+        targetSdkVersion 31
         versionCode 1
         versionName "1.0"
 
@@ -91,6 +90,11 @@ android {
         }
         sourceDirs = files(subprojects.collect { p -> new File(p.projectDir, "/src/main/java") })
     }
+
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_11
+        targetCompatibility JavaVersion.VERSION_11
+    }
 //    TODO: Uncomment this section when you want to build/ generate multiple module documentation including app by using dokka
 //    TODO: Add main.java.srcDirs of module to merge module and generated documentation by dokka
 //    sourceSets {
@@ -102,10 +106,10 @@ android {
 
 dependencies {
     implementation project(':core')
-    implementation "org.koin:koin-androidx-viewmodel:$koin_version"
+    implementation "io.insert-koin:koin-android:$koin_version"
+    implementation "androidx.appcompat:appcompat:$appcompat_version"
 
     testImplementation "junit:junit:$junit_version"
-    androidTestImplementation 'androidx.test.ext:junit:1.1.2'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
-    annotationProcessor 'androidx.room:room-compiler:2.2.6'
+    androidTestImplementation "androidx.test.ext:junit:$androidx_junit"
+    androidTestImplementation "androidx.test.espresso:espresso-core:$androidx_espresso_core"
 }
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -12,7 +12,8 @@
         android:theme="@style/Theme.MNCCoreAndroid">
         <activity
             android:name=".ui.MainActivity"
-            android:label="@string/title_activity_main">
+            android:label="@string/title_activity_main"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 

diff --git a/app/src/main/java/com/mncgroup/mnccore/ui/MainActivity.kt b/app/src/main/java/com/mncgroup/mnccore/ui/MainActivity.kt
@@ -7,7 +7,7 @@ import com.mncgroup.core.util.ext.*
 import com.mncgroup.mnccore.databinding.ActivityMainBinding
 
 class MainActivity : Activity() {
-    lateinit var binding: ActivityMainBinding
+    private lateinit var binding: ActivityMainBinding
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
@@ -43,7 +43,7 @@ class MainActivity : Activity() {
                     showDatePickerAction(null,null) { day, month, year ->
                         Toast.makeText(this@MainActivity, "selected date is " + day +
                                 " / " + month +
-                                " / " + year, Toast.LENGTH_SHORT).show();
+                                " / " + year, Toast.LENGTH_SHORT).show()
                     }.show()
                 }
             }

diff --git a/build.gradle b/build.gradle
@@ -1,38 +1,40 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 buildscript {
     //kotlin
-    ext.kotlin_version = '1.4.31'
-    ext.kotlin_core_version = "1.3.2"
+    ext.kotlin_version = '1.6.10'
+    ext.kotlin_core_version = "1.7.0"
     ext.kotlinx_coroutine_version = "1.4.3"
 
     //androidx/ jetpack component
-    ext.constraintlayout_version = "2.0.4"
+    ext.constraintlayout_version = "2.1.3"
     ext.nav_version = "2.3.3"
-    ext.material_version = "1.3.0"
-    ext.appcompat_version = "1.2.0"
+    ext.material_version = "1.5.0"
+    ext.appcompat_version = "1.4.1"
     ext.fragment_version = "1.3.0"
     ext.room_version = "2.2.6"
 
     //network components
     ext.gson_version = "2.8.6"
     ext.retrofit_version = "2.9.0"
     ext.glide_version = '4.12.0'
-    ext.koin_version = "2.2.2"
+    ext.koin_version = "3.1.4"
     ext.okhttp3_logging_version = "3.14.9"
 
     //test
     ext.junit_version = "4.13.2"
+    ext.androidx_junit = "1.1.3"
+    ext.androidx_espresso_core = "3.4.0"
 
     //documentation
     ext.dokka_version = '0.9.18'
 //    ext.dokka_version = '1.4.30'
 
     repositories {
         google()
-        jcenter()
+        mavenCentral()
     }
     dependencies {
-        classpath "com.android.tools.build:gradle:4.1.2"
+        classpath "com.android.tools.build:gradle:7.0.4"
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         classpath "org.jetbrains.dokka:dokka-android-gradle-plugin:$dokka_version"
 //        classpath "org.jetbrains.dokka:dokka-gradle-plugin:1.4.30"
@@ -47,7 +49,7 @@ buildscript {
 allprojects {
     repositories {
         google()
-        jcenter()
+        mavenCentral()
     }
 }
 

diff --git a/core/build.gradle b/core/build.gradle
@@ -5,12 +5,11 @@ plugins {
 }
 
 android {
-    compileSdkVersion 30
-    buildToolsVersion "29.0.3"
+    compileSdkVersion 31
 
     defaultConfig {
         minSdkVersion 21
-        targetSdkVersion 30
+        targetSdkVersion 31
         versionCode 1
         versionName "1.0"
 
@@ -39,7 +38,8 @@ android {
 
 dependencies {
 
-    implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
+    api 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.0'
+
     implementation "androidx.core:core-ktx:$kotlin_core_version"
     implementation "androidx.constraintlayout:constraintlayout:$constraintlayout_version"
 
@@ -56,11 +56,11 @@ dependencies {
 
     implementation "androidx.appcompat:appcompat:$appcompat_version"
     implementation "com.google.android.material:material:$material_version"
-    // Koin AndroidX ViewModel features
-    implementation "org.koin:koin-androidx-viewmodel:$koin_version"
 
+    // Koin main features for Android
+    api "io.insert-koin:koin-android:$koin_version"
 
     testImplementation "junit:junit:$junit_version"
-    androidTestImplementation 'androidx.test.ext:junit:1.1.2'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
+    androidTestImplementation "androidx.test.ext:junit:$androidx_junit"
+    androidTestImplementation "androidx.test.espresso:espresso-core:$androidx_espresso_core"
 }
diff --git a/core/src/main/java/com/mncgroup/core/ui/BaseWebViewActivity.kt b/core/src/main/java/com/mncgroup/core/ui/BaseWebViewActivity.kt
@@ -84,9 +84,7 @@ abstract class BaseWebViewActivity : BaseActivity() {
             WebView.setWebContentsDebuggingEnabled(true)
         }
 
-        binding.toolbar.let {
-            setSupportActionBar(it)
-        }
+        setSupportActionBar(binding.toolbar)
         showToolbar(true)
         showToolbarBack(true)
         showToolbarTitle(true)

diff --git a/core/src/main/java/com/mncgroup/core/util/ext/AlertDialogs.kt b/core/src/main/java/com/mncgroup/core/util/ext/AlertDialogs.kt
@@ -1,6 +1,5 @@
 package com.mncgroup.core.util.ext
 
-import android.app.DatePickerDialog
 import android.content.Context
 import android.content.DialogInterface
 import androidx.appcompat.app.AlertDialog

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-all.zip