Bump Kotlin to 1.7.10

dependencies.gradle

@@ -24,8 +24,8 @@ ext {
 
     asmVersion='9.3'
 
-    kotlinVersion='1.5.20'
+    kotlinVersion='1.7.10'
     autoServiceVersion='1.0.1'
     multidexVersion='2.0.1'
     sqlite4javaVersion='1.0.392'
-}
+}

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradlew

@@ -205,6 +205,12 @@ set -- \
         org.gradle.wrapper.GradleWrapperMain \
         "$@"
 
+# Stop when "xargs" is not available.
+if ! command -v xargs >/dev/null 2>&1
+then
+    die "xargs is not available"
+fi
+
 # Use "xargs" to parse quoted args.
 #
 # With -n1 it outputs one arg per line, with the quotes and backslashes removed.

gradlew.bat

@@ -14,7 +14,7 @@
 @rem limitations under the License.
 @rem
 
-@if "%DEBUG%" == "" @echo off
+@if "%DEBUG%"=="" @echo off
 @rem ##########################################################################
 @rem
 @rem  Gradle startup script for Windows
@@ -25,7 +25,7 @@
 if "%OS%"=="Windows_NT" setlocal
 
 set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
+if "%DIRNAME%"=="" set DIRNAME=.
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
@@ -40,7 +40,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome
 
 set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto execute
+if %ERRORLEVEL% equ 0 goto execute
 
 echo.
 echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
@@ -75,13 +75,15 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 
 :end
 @rem End local scope for the variables with windows NT shell
-if "%ERRORLEVEL%"=="0" goto mainEnd
+if %ERRORLEVEL% equ 0 goto mainEnd
 
 :fail
 rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
 rem the _cmd.exe /c_ return code!
-if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
-exit /b 1
+set EXIT_CODE=%ERRORLEVEL%
+if %EXIT_CODE% equ 0 set EXIT_CODE=1
+if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
+exit /b %EXIT_CODE%
 
 :mainEnd
 if "%OS%"=="Windows_NT" endlocal

integration_tests/androidx_test/build.gradle

@@ -11,7 +11,6 @@ android {
     defaultConfig {
         minSdk 16
         targetSdk 33
-        multiDexEnabled true
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
 
@@ -43,7 +42,6 @@ dependencies {
     implementation "androidx.appcompat:appcompat:$appCompatVersion"
     implementation "androidx.constraintlayout:constraintlayout:$constraintlayoutVersion"
     implementation "androidx.multidex:multidex:$multidexVersion"
-    implementation project(path: ':shadowapi', configuration: 'default')
 
     // Testing dependencies
     testImplementation project(":robolectric")
@@ -59,6 +57,7 @@ dependencies {
     testImplementation "androidx.test.ext:junit:$axtJunitVersion"
     testImplementation "com.google.truth:truth:$truthVersion"
 
+    androidTestImplementation project(':annotations')
     androidTestImplementation "androidx.test:runner:$axtVersion"
     androidTestImplementation "junit:junit:$junitVersion"
     androidTestImplementation "androidx.test:rules:$axtVersion"

integration_tests/ctesque/build.gradle

@@ -45,8 +45,7 @@ android {
 }
 
 dependencies {
-    implementation project(path: ':testapp')
-    implementation project(path: ':shadowapi', configuration: 'default')
+    implementation project(':testapp')
 
     testImplementation project(":robolectric")
     testImplementation "junit:junit:${junitVersion}"
@@ -61,6 +60,7 @@ dependencies {
     testImplementation("com.google.guava:guava:$guavaJREVersion")
 
     // Testing dependencies
+    androidTestImplementation project(':shadowapi')
     // temporarily use a newer monitor version for HardwareRendererCompat
     androidTestImplementation("androidx.test:monitor:1.5.0-alpha03")
     androidTestImplementation("androidx.test:runner:$axtVersion")

utils/build.gradle

@@ -13,6 +13,40 @@ spotless {
     }
 }
 
+tasks.withType(GenerateModuleMetadata) {
+    // We don't want to release gradle module metadata now to avoid
+    // potential compatibility problems.
+    enabled = false
+}
+
+compileKotlin {
+    // Use java/main classes directory to replace default kotlin/main to
+    // avoid d8 error when dexing & desugaring kotlin classes with non-exist
+    // kotlin/main directory because utils module doesn't have kotlin code
+    // in production. If utils module starts to add Kotlin code in main source
+    // set, we can remove this destinationDirectory modification.
+    destinationDirectory = file("${projectDir}/build/classes/java/main")
+    kotlinOptions {
+        jvmTarget = "1.8"
+    }
+}
+
+afterEvaluate {
+    configurations {
+        runtimeElements {
+            attributes {
+                // We should add artifactType with jar to ensure standard runtimeElements variant
+                // has a max priority selection sequence than other variants that brought by
+                // kotlin plugin.
+                attribute(
+                        Attribute.of("artifactType", String.class),
+                        ArtifactTypeDefinition.JAR_TYPE
+                )
+            }
+        }
+    }
+}
+
 dependencies {
     api project(":annotations")
     api project(":pluginapi")