Upgrade to Android Studio Electric Eel to solve some test bugs

app/lint.xml

@@ -45,6 +45,8 @@
         <ignore path="org/bouncycastle/est/jcajce/JcaJceUtils$1.class"/>
         <ignore path="org/bouncycastle/est/jcajce/JcaJceUtils$2.class"/>
         <ignore path="org/apache/commons/net/util/TrustManagerUtils$TrustManager.class"/>
+        <ignore path="\*/bcpkix-jdk15to18-1.71.jar"/>
+        <ignore path="\*/commons-net-3.6.jar"/>
     </issue>
 
     <issue id="PluralsCandidate" severity="error"/>

build.gradle

@@ -4,8 +4,8 @@ buildscript {
         maven { url 'https://maven.google.com/' }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.2.2'
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.7.20"
+        classpath 'com.android.tools.build:gradle:7.4.0'
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.8.0"
         classpath "org.jetbrains.dokka:dokka-gradle-plugin:1.7.20"
         classpath 'com.vanniktech:gradle-maven-publish-plugin:0.18.0'
     }

gradle.properties

@@ -4,6 +4,7 @@ android.useAndroidX=true
 
 kotlin.code.style=official
 kotlin.mpp.stability.nowarn=true
+kotlin.mpp.androidSourceSetLayoutVersion=2
 
 # Gradle Maven Publish Info below (https://github.com/vanniktech/gradle-maven-publish-plugin)
 # These are common for all libraries in gradle submodules.

libs/download/build.gradle

@@ -62,9 +62,7 @@ kotlin {
                 implementation "com.github.bumptech.glide:annotations:4.12.0"
             }
         }
-        androidTest {
-            // needed because of https://issuetracker.google.com/issues/231701341
-            kotlin.srcDir("src/commonTest/kotlin")
+        androidUnitTest {
             dependencies {
                 implementation kotlin('test')
                 implementation 'org.json:json:20220320'
@@ -72,8 +70,10 @@ kotlin {
                 implementation 'ch.qos.logback:logback-classic:1.2.11'
             }
         }
-        androidAndroidTest {
+        androidInstrumentedTest {
             dependencies {
+                implementation project(":libs:sharedTest")
+                implementation kotlin('test')
                 implementation 'androidx.test:runner:1.4.0'
                 implementation 'androidx.test.ext:junit:1.1.3'
             }

libs/index/build.gradle

@@ -1,6 +1,6 @@
 plugins {
     id 'org.jetbrains.kotlin.multiplatform'
-    id 'org.jetbrains.kotlin.plugin.serialization' version '1.7.21'
+    id 'org.jetbrains.kotlin.plugin.serialization' version '1.8.0'
     id 'com.android.library'
     id 'org.jetbrains.dokka'
     id "org.jlleitschuh.gradle.ktlint" version "10.2.1"
@@ -58,24 +58,22 @@ kotlin {
             }
         }
         androidMain {
-            // needed because of https://issuetracker.google.com/issues/231701341
-            kotlin.srcDir("src/commonMain/kotlin")
             dependencies {
-                implementation "org.jetbrains.kotlin:kotlin-reflect:1.7.21"
+                implementation "org.jetbrains.kotlin:kotlin-reflect:1.8.0"
                 implementation 'androidx.core:core-ktx:1.8.0'
                 implementation "org.slf4j:slf4j-android:1.7.36"
             }
         }
-        androidTest {
-            // needed because of https://issuetracker.google.com/issues/231701341
-            kotlin.srcDir("src/commonTest/kotlin")
+        androidUnitTest {
             dependencies {
                 implementation 'junit:junit:4.13.2'
                 implementation 'io.mockk:mockk:1.12.4'
             }
         }
-        androidAndroidTest {
+        androidInstrumentedTest {
             dependencies {
+                implementation project(":libs:sharedTest")
+                implementation kotlin('test')
                 implementation 'androidx.test:runner:1.4.0'
                 implementation 'androidx.test.ext:junit:1.1.3'
             }