Merge branch 'develop' into fixes-for-chat

Alex009 · Alex009 · commit 900794d9f282 · 2021-01-02T14:53:24.000+07:00
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -13,9 +13,8 @@ buildscript {
         maven { url = uri("https://dl.bintray.com/icerockdev/plugins") }
     }
     dependencies {
-        classpath("gradle:moko-widgets-deps:1")
-        classpath("dev.icerock.moko:resources-generator:0.13.1")
-        classpath("dev.icerock.moko.widgets:gradle-plugin:0.1.0-dev-21")
+        plugin(Deps.Plugins.mokoResources)
+        plugin(Deps.Plugins.mokoWidgets)
     }
 }
 
@@ -42,6 +41,14 @@ allprojects {
                 "compileOnly"("javax.annotation:jsr250-api:1.0")
             }
         }
+    
+    configurations.all {
+        resolutionStrategy.dependencySubstitution {
+            substitute(module("com.nbsp:library"))
+                .using(module("com.nbsp:materialfilepicker:1.9.1"))
+                .because("androidx support in new artifact")
+        }
+    }
 
     plugins.withType<com.android.build.gradle.LibraryPlugin> {
         configure<com.android.build.gradle.LibraryExtension> {
@@ -97,18 +104,3 @@ tasks.register("clean", Delete::class).configure {
     group = "build"
     delete(rootProject.buildDir)
 }
-
-allprojects {
-    plugins.withId(Deps.Plugins.kotlinMultiplatform.id) {
-        configure<org.jetbrains.kotlin.gradle.dsl.KotlinMultiplatformExtension> {
-            targets.withType(org.jetbrains.kotlin.gradle.plugin.mpp.KotlinNativeTarget::class.java) {
-                compilations.all {
-                    kotlinOptions.freeCompilerArgs += "-Xdisable-fake-override-validator"
-                }
-                binaries.all {
-                    freeCompilerArgs += "-Xdisable-fake-override-validator"
-                }
-            }
-        }
-    }
-}
diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
@@ -2,11 +2,10 @@
  * Copyright 2019 IceRock MAG Inc. Use of this source code is governed by the Apache 2.0 license.
  */
 
-import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 import java.io.ByteArrayOutputStream
 
 plugins {
-    id("org.jetbrains.kotlin.jvm") version ("1.4.20")
+    id("org.jetbrains.kotlin.jvm") version "1.4.30-M1"
     id("com.github.kukuhyoniatmoko.buildconfigkotlin") version "1.0.5"
 }
 
@@ -19,13 +18,16 @@ repositories {
 
 dependencies {
     api(gradleApi())
-    api("dev.icerock:mobile-multiplatform:0.8.0")
-    api("org.jetbrains.kotlin:kotlin-gradle-plugin:1.4.20")
-    api("com.android.tools.build:gradle:4.0.2")
+    api("dev.icerock:mobile-multiplatform:0.9.0")
+    api("org.jetbrains.kotlin:kotlin-gradle-plugin:1.4.30-M1")
+    api("com.android.tools.build:gradle:4.1.1")
 }
 
-group = "gradle"
-version = "1"
+tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile::class.java).all {
+    kotlinOptions {
+        jvmTarget = "1.8"
+    }
+}
 
 val mokoWidgetsVersion: String = when (properties.containsKey("devPublish")) {
     true -> getGitCommit()
@@ -46,12 +48,3 @@ fun getGitCommit(): String {
     }
     return stdout.toString().trim()
 }
-
-val compileKotlin: KotlinCompile by tasks
-compileKotlin.kotlinOptions {
-    jvmTarget = "1.8"
-}
-val compileTestKotlin: KotlinCompile by tasks
-compileTestKotlin.kotlinOptions {
-    jvmTarget = "1.8"
-}
diff --git a/buildSrc/src/main/kotlin/Deps.kt b/buildSrc/src/main/kotlin/Deps.kt
@@ -3,7 +3,7 @@
  */
 
 object Deps {
-    private const val kotlinVersion = "1.4.20"
+    private const val kotlinVersion = "1.4.30-M1"
     private const val autoServiceVersion = "1.0-rc6"
 
     private const val androidAppCompatVersion = "1.1.0"
@@ -18,26 +18,25 @@ object Deps {
     private const val roundedImageViewVersion = "2.3.0"
     private const val playServiceAuthVersion = "17.0.0"
     private const val playServiceAuthSmsVersion = "17.1.0"
-    private const val multiDexVersion = "2.0.1"
 
-    private const val detektVersion = "1.7.4"
+    private const val detektVersion = "1.15.0"
 
     private const val klockVersion = "1.12.0"
-    private const val coroutinesVersion = "1.3.9"
-    private const val mokoGraphicsVersion = "0.4.0"
-    private const val mokoParcelizeVersion = "0.4.0"
-    private const val mokoResourcesVersion = "0.13.1"
-    private const val mokoMvvmVersion = "0.8.0"
+    private const val coroutinesVersion = "1.4.2"
+    private const val mokoGraphicsVersion = "0.5.0"
+    private const val mokoParcelizeVersion = "0.5.0"
+    private const val mokoResourcesVersion = "0.13.2"
+    private const val mokoMvvmVersion = "0.8.1"
     private const val mokoFieldsVersion = "0.5.0"
     private const val mokoUnitsVersion = "0.4.1"
-    private const val mokoMediaVersion = "0.5.0"
-    private const val mokoPermissionsVersion = "0.6.0"
+    private const val mokoMediaVersion = "0.6.0"
+    private const val mokoPermissionsVersion = "0.7.0"
     const val mokoWidgetsVersion = BuildConfig.widgetsVersion
 
     object Android {
         const val compileSdk = 28
         const val targetSdk = 28
-        const val minSdk = 16
+        const val minSdk = 21
     }
 
     object Plugins {
@@ -49,7 +48,7 @@ object Deps {
         val kotlinCocoapods = GradlePlugin(id = "org.jetbrains.kotlin.native.cocoapods")
         val kotlinKapt = GradlePlugin(id = "kotlin-kapt")
         val kotlinAndroid = GradlePlugin(id = "kotlin-android")
-        val kotlinAndroidExtensions = GradlePlugin(id = "kotlin-android-extensions")
+        val kotlinParcelize = GradlePlugin(id = "kotlin-parcelize")
         val kotlinSerialization = GradlePlugin(id = "kotlin-serialization")
         val mavenPublish = GradlePlugin(id = "org.gradle.maven-publish")
 
@@ -102,8 +101,6 @@ object Deps {
                 "com.google.android.gms:play-services-auth:$playServiceAuthVersion"
             const val playServiceAuthSms =
                 "com.google.android.gms:play-services-auth-api-phone:$playServiceAuthSmsVersion"
-            const val multiDex =
-                "androidx.multidex:multidex:$multiDexVersion"
         }
 
         object MultiPlatform {
diff --git a/buildSrc/src/main/kotlin/dev/icerock/moko/widgets/gradle/BintrayPublishingPlugin.kt b/buildSrc/src/main/kotlin/dev/icerock/moko/widgets/gradle/BintrayPublishingPlugin.kt
diff --git a/buildSrc/src/main/kotlin/dev/icerock/moko/widgets/gradle/PublishToBintrayRepository.kt b/buildSrc/src/main/kotlin/dev/icerock/moko/widgets/gradle/PublishToBintrayRepository.kt
diff --git a/buildSrc/src/main/kotlin/org/gradle/api/publish/maven/internal/publisher/BintrayPublisher.kt b/buildSrc/src/main/kotlin/org/gradle/api/publish/maven/internal/publisher/BintrayPublisher.kt
diff --git a/gradle.properties b/gradle.properties
@@ -5,7 +5,6 @@ org.gradle.parallel=true
 kotlin.code.style=official
 
 android.useAndroidX=true
-android.enableJetifier=true
 
 # Workaround for Bintray treating .sha512 files as artifacts
 # https://github.com/gradle/gradle/issues/11412
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/gradlew b/gradlew
@@ -82,6 +82,7 @@ esac
 
 CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
 
+
 # Determine the Java command to use to start the JVM.
 if [ -n "$JAVA_HOME" ] ; then
     if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
@@ -125,10 +126,11 @@ if $darwin; then
     GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
 fi
 
-# For Cygwin, switch paths to Windows format before running java
-if $cygwin ; then
+# For Cygwin or MSYS, switch paths to Windows format before running java
+if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
     APP_HOME=`cygpath --path --mixed "$APP_HOME"`
     CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+
     JAVACMD=`cygpath --unix "$JAVACMD"`
 
     # We build the pattern for arguments to be converted via cygpath
@@ -154,19 +156,19 @@ if $cygwin ; then
         else
             eval `echo args$i`="\"$arg\""
         fi
-        i=$((i+1))
+        i=`expr $i + 1`
     done
     case $i in
-        (0) set -- ;;
-        (1) set -- "$args0" ;;
-        (2) set -- "$args0" "$args1" ;;
-        (3) set -- "$args0" "$args1" "$args2" ;;
-        (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
-        (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
-        (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
-        (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
-        (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
-        (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+        0) set -- ;;
+        1) set -- "$args0" ;;
+        2) set -- "$args0" "$args1" ;;
+        3) set -- "$args0" "$args1" "$args2" ;;
+        4) set -- "$args0" "$args1" "$args2" "$args3" ;;
+        5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
+        6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
+        7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
+        8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
+        9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
     esac
 fi
 
@@ -175,14 +177,9 @@ save () {
     for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
     echo " "
 }
-APP_ARGS=$(save "$@")
+APP_ARGS=`save "$@"`
 
 # Collect all arguments for the java command, following the shell quoting and substitution rules
 eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
 
-# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
-if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
-  cd "$(dirname "$0")"
-fi
-
 exec "$JAVACMD" "$@"
diff --git a/gradlew.bat b/gradlew.bat
@@ -29,6 +29,9 @@ if "%DIRNAME%" == "" set DIRNAME=.
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
+@rem Resolve any "." and ".." in APP_HOME to make it shorter.
+for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
+
 @rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
 set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
 
@@ -37,7 +40,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome
 
 set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto init
+if "%ERRORLEVEL%" == "0" goto execute
 
 echo.
 echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
@@ -51,7 +54,7 @@ goto fail
 set JAVA_HOME=%JAVA_HOME:"=%
 set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
-if exist "%JAVA_EXE%" goto init
+if exist "%JAVA_EXE%" goto execute
 
 echo.
 echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
@@ -61,28 +64,14 @@ echo location of your Java installation.
 
 goto fail
 
-:init
-@rem Get command-line arguments, handling Windows variants
-
-if not "%OS%" == "Windows_NT" goto win9xME_args
-
-:win9xME_args
-@rem Slurp the command line arguments.
-set CMD_LINE_ARGS=
-set _SKIP=2
-
-:win9xME_args_slurp
-if "x%~1" == "x" goto execute
-
-set CMD_LINE_ARGS=%*
-
 :execute
 @rem Setup the command line
 
 set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 
+
 @rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
 
 :end
 @rem End local scope for the variables with windows NT shell
diff --git a/plugin/build.gradle.kts b/plugin/build.gradle.kts
@@ -2,21 +2,6 @@
  * Copyright 2020 IceRock MAG Inc. Use of this source code is governed by the Apache 2.0 license.
  */
 
-buildscript {
-    repositories {
-        jcenter()
-        google()
-
-        maven { url = uri("https://dl.bintray.com/kotlin/kotlin") }
-        maven { url = uri("https://kotlin.bintray.com/kotlinx") }
-        maven { url = uri("https://plugins.gradle.org/m2/") }
-        maven { url = uri("https://dl.bintray.com/icerockdev/plugins") }
-    }
-    dependencies {
-        classpath("gradle:moko-widgets-deps:1")
-    }
-}
-
 allprojects {
     repositories {
         google()
diff --git a/plugin/buildSrc/build.gradle.kts b/plugin/buildSrc/build.gradle.kts
@@ -0,0 +1 @@
+../../buildSrc/build.gradle.kts
diff --git a/plugin/buildSrc/src b/plugin/buildSrc/src
@@ -0,0 +1 @@
+../../buildSrc/src
diff --git a/plugin/settings.gradle.kts b/plugin/settings.gradle.kts
@@ -2,8 +2,6 @@
  * Copyright 2020 IceRock MAG Inc. Use of this source code is governed by the Apache 2.0 license.
  */
 
-includeBuild("../moko-widgets-deps")
-
 include(":kotlin-common-plugin")
 include(":kotlin-plugin")
 include(":kotlin-native-plugin")
diff --git a/sample/android-app/build.gradle.kts b/sample/android-app/build.gradle.kts
@@ -26,8 +26,6 @@ android {
         versionName = Deps.mokoWidgetsVersion
 
         vectorDrawables.useSupportLibrary = true
-
-        multiDexEnabled = true
     }
 
     buildTypes {
@@ -44,14 +42,18 @@ android {
     packagingOptions {
         exclude("META-INF/*.kotlin_module")
     }
+
+    compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_1_8
+        targetCompatibility = JavaVersion.VERSION_1_8
+    }
 }
 
 dependencies {
     implementation(Deps.Libs.Android.appCompat)
     implementation(Deps.Libs.Android.recyclerView)
     implementation(Deps.Libs.Android.material)
     implementation(Deps.Libs.Android.constraintLayout)
-    implementation(Deps.Libs.Android.multiDex)
 
     implementation(Deps.Libs.MultiPlatform.mokoWidgets.common)
     implementation(project(":sample:mpp-library"))
diff --git a/sample/android-app/src/main/java/com/icerockdev/MainApplication.kt b/sample/android-app/src/main/java/com/icerockdev/MainApplication.kt
@@ -5,10 +5,10 @@
 package com.icerockdev
 
 import App
-import androidx.multidex.MultiDexApplication
+import android.app.Application
 import dev.icerock.moko.widgets.core.screen.BaseApplication
 
-class MainApplication : MultiDexApplication() {
+class MainApplication : Application() {
     override fun onCreate() {
         super.onCreate()
 
diff --git a/sample/mpp-library/build.gradle.kts b/sample/mpp-library/build.gradle.kts
@@ -7,7 +7,7 @@ plugins {
     id("org.jetbrains.kotlin.multiplatform")
     id("dev.icerock.mobile.multiplatform")
     id("kotlin-kapt")
-    id("kotlin-android-extensions")
+    id("kotlin-parcelize")
     id("dev.icerock.mobile.multiplatform-resources")
     id("dev.icerock.mobile.multiplatform.ios-framework")
 }
diff --git a/settings.gradle.kts b/settings.gradle.kts
diff --git a/widgets-datetime-picker/build.gradle.kts b/widgets-datetime-picker/build.gradle.kts
diff --git a/widgets/build.gradle.kts b/widgets/build.gradle.kts
