diff --git a/app/lint.xml b/app/lint.xml
index 68735c5b6..f654a83a6 100644
--- a/app/lint.xml
+++ b/app/lint.xml
@@ -45,6 +45,8 @@
+
+
diff --git a/build.gradle b/build.gradle
index 13ad8a7e1..70769a5a2 100644
--- a/build.gradle
+++ b/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'
}
diff --git a/gradle.properties b/gradle.properties
index be6ae89d2..f38266a3c 100644
--- a/gradle.properties
+++ b/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.
diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml
index 0631eccaa..fd8670a4a 100644
--- a/gradle/verification-metadata.xml
+++ b/gradle/verification-metadata.xml
@@ -74,6 +74,7 @@
+
@@ -506,6 +507,11 @@
+
+
+
+
+
@@ -529,6 +535,11 @@
+
+
+
+
+
@@ -1425,6 +1436,11 @@
+
+
+
+
+
@@ -1448,6 +1464,11 @@
+
+
+
+
+
@@ -1471,6 +1492,11 @@
+
+
+
+
+
@@ -1494,6 +1520,11 @@
+
+
+
+
+
@@ -1517,6 +1548,11 @@
+
+
+
+
+
@@ -1540,6 +1576,16 @@
+
+
+
+
+
+
+
+
+
+
@@ -1563,6 +1609,11 @@
+
+
+
+
+
@@ -1586,6 +1637,11 @@
+
+
+
+
+
@@ -1609,6 +1665,11 @@
+
+
+
+
+
@@ -1632,6 +1693,11 @@
+
+
+
+
+
@@ -1655,6 +1721,11 @@
+
+
+
+
+
@@ -1678,6 +1749,11 @@
+
+
+
+
+
@@ -1701,6 +1777,11 @@
+
+
+
+
+
@@ -1731,6 +1812,11 @@
+
+
+
+
+
@@ -1764,6 +1850,11 @@
+
+
+
+
+
@@ -1779,6 +1870,11 @@
+
+
+
+
+
@@ -1802,6 +1898,11 @@
+
+
+
+
+
@@ -1825,6 +1926,11 @@
+
+
+
+
+
@@ -1848,6 +1954,11 @@
+
+
+
+
+
@@ -1871,6 +1982,11 @@
+
+
+
+
+
@@ -1894,6 +2010,11 @@
+
+
+
+
+
@@ -1907,6 +2028,11 @@
+
+
+
+
+
@@ -1940,6 +2066,11 @@
+
+
+
+
+
@@ -1963,6 +2094,16 @@
+
+
+
+
+
+
+
+
+
+
@@ -1986,6 +2127,11 @@
+
+
+
+
+
@@ -2008,6 +2154,11 @@
+
+
+
+
+
@@ -2021,6 +2172,11 @@
+
+
+
+
+
@@ -2044,6 +2200,11 @@
+
+
+
+
+
@@ -2054,6 +2215,11 @@
+
+
+
+
+
@@ -2077,6 +2243,11 @@
+
+
+
+
+
@@ -2100,6 +2271,11 @@
+
+
+
+
+
@@ -2123,6 +2299,11 @@
+
+
+
+
+
@@ -2146,6 +2327,11 @@
+
+
+
+
+
@@ -2169,6 +2355,11 @@
+
+
+
+
+
@@ -2192,6 +2383,11 @@
+
+
+
+
+
@@ -2215,6 +2411,11 @@
+
+
+
+
+
@@ -2238,6 +2439,11 @@
+
+
+
+
+
@@ -2266,11 +2472,21 @@
+
+
+
+
+
+
+
+
+
+
@@ -2281,6 +2497,11 @@
+
+
+
+
+
@@ -2291,6 +2512,11 @@
+
+
+
+
+
@@ -2301,6 +2527,11 @@
+
+
+
+
+
@@ -2311,6 +2542,11 @@
+
+
+
+
+
@@ -2321,6 +2557,11 @@
+
+
+
+
+
@@ -2331,6 +2572,11 @@
+
+
+
+
+
@@ -2341,6 +2587,11 @@
+
+
+
+
+
@@ -2351,6 +2602,11 @@
+
+
+
+
+
@@ -2361,6 +2617,11 @@
+
+
+
+
+
@@ -2371,6 +2632,11 @@
+
+
+
+
+
@@ -2381,6 +2647,11 @@
+
+
+
+
+
@@ -2391,6 +2662,11 @@
+
+
+
+
+
@@ -2401,6 +2677,11 @@
+
+
+
+
+
@@ -2411,6 +2692,11 @@
+
+
+
+
+
@@ -2421,6 +2707,11 @@
+
+
+
+
+
@@ -2722,6 +3013,11 @@
+
+
+
+
+
@@ -2940,6 +3236,11 @@
+
+
+
+
+
@@ -3142,6 +3443,11 @@
+
+
+
+
+
@@ -3155,6 +3461,11 @@
+
+
+
+
+
@@ -3173,21 +3484,41 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -3198,11 +3529,21 @@
+
+
+
+
+
+
+
+
+
+
@@ -3768,36 +4109,71 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -4995,51 +5371,101 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -5050,6 +5476,11 @@
+
+
+
+
+
@@ -5537,6 +5968,11 @@
+
+
+
+
+
@@ -5578,6 +6014,11 @@
+
+
+
+
+
@@ -5746,6 +6187,11 @@
+
+
+
+
+
@@ -5772,6 +6218,11 @@
+
+
+
+
+
@@ -5847,6 +6298,11 @@
+
+
+
+
+
@@ -5991,6 +6447,11 @@
+
+
+
+
+
@@ -6154,6 +6615,11 @@
+
+
+
+
+
@@ -6164,6 +6630,11 @@
+
+
+
+
+
@@ -6174,6 +6645,11 @@
+
+
+
+
+
@@ -6184,6 +6660,11 @@
+
+
+
+
+
@@ -6412,6 +6893,11 @@
+
+
+
+
+
@@ -6437,6 +6923,11 @@
+
+
+
+
+
@@ -6462,6 +6953,11 @@
+
+
+
+
+
@@ -6492,6 +6988,11 @@
+
+
+
+
+
@@ -6517,6 +7018,11 @@
+
+
+
+
+
@@ -6542,6 +7048,11 @@
+
+
+
+
+
@@ -6572,6 +7083,11 @@
+
+
+
+
+
@@ -6606,6 +7122,11 @@
+
+
+
+
+
@@ -6657,6 +7178,14 @@
+
+
+
+
+
+
+
+
@@ -6667,11 +7196,21 @@
+
+
+
+
+
+
+
+
+
+
@@ -6697,6 +7236,11 @@
+
+
+
+
+
@@ -6722,6 +7266,11 @@
+
+
+
+
+
@@ -6747,6 +7296,11 @@
+
+
+
+
+
@@ -6777,6 +7331,11 @@
+
+
+
+
+
@@ -6807,6 +7366,11 @@
+
+
+
+
+
@@ -6862,6 +7426,11 @@
+
+
+
+
+
@@ -6892,6 +7461,11 @@
+
+
+
+
+
@@ -6917,6 +7491,11 @@
+
+
+
+
+
@@ -6942,6 +7521,11 @@
+
+
+
+
+
@@ -6967,6 +7551,11 @@
+
+
+
+
+
@@ -6992,6 +7581,11 @@
+
+
+
+
+
@@ -7017,6 +7611,11 @@
+
+
+
+
+
@@ -7087,6 +7686,11 @@
+
+
+
+
+
@@ -7152,6 +7756,11 @@
+
+
+
+
+
@@ -7212,6 +7821,11 @@
+
+
+
+
+
@@ -7272,6 +7886,11 @@
+
+
+
+
+
@@ -7297,6 +7916,11 @@
+
+
+
+
+
@@ -7322,6 +7946,11 @@
+
+
+
+
+
@@ -7347,6 +7976,11 @@
+
+
+
+
+
@@ -7372,6 +8006,11 @@
+
+
+
+
+
@@ -7387,6 +8026,11 @@
+
+
+
+
+
@@ -7437,6 +8081,11 @@
+
+
+
+
+
@@ -7462,6 +8111,11 @@
+
+
+
+
+
diff --git a/libs/download/build.gradle b/libs/download/build.gradle
index f0a38c664..1f0047a71 100644
--- a/libs/download/build.gradle
+++ b/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'
}
diff --git a/libs/download/src/androidAndroidTest/kotlin/org/fdroid/download/HttpManagerInstrumentationTest.kt b/libs/download/src/androidInstrumentedTest/kotlin/org/fdroid/download/HttpManagerInstrumentationTest.kt
similarity index 100%
rename from libs/download/src/androidAndroidTest/kotlin/org/fdroid/download/HttpManagerInstrumentationTest.kt
rename to libs/download/src/androidInstrumentedTest/kotlin/org/fdroid/download/HttpManagerInstrumentationTest.kt
diff --git a/libs/download/src/androidTest/kotlin/org/fdroid/download/HttpDownloaderTest.kt b/libs/download/src/androidUnitTest/kotlin/org/fdroid/download/HttpDownloaderTest.kt
similarity index 100%
rename from libs/download/src/androidTest/kotlin/org/fdroid/download/HttpDownloaderTest.kt
rename to libs/download/src/androidUnitTest/kotlin/org/fdroid/download/HttpDownloaderTest.kt
diff --git a/libs/download/src/androidTest/kotlin/org/fdroid/download/HttpPosterTest.kt b/libs/download/src/androidUnitTest/kotlin/org/fdroid/download/HttpPosterTest.kt
similarity index 100%
rename from libs/download/src/androidTest/kotlin/org/fdroid/download/HttpPosterTest.kt
rename to libs/download/src/androidUnitTest/kotlin/org/fdroid/download/HttpPosterTest.kt
diff --git a/libs/index/build.gradle b/libs/index/build.gradle
index 8310c9f37..3fed6ec0e 100644
--- a/libs/index/build.gradle
+++ b/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'
}
diff --git a/libs/index/src/androidAndroidTest/kotlin/org/fdroid/BestLocaleTest.kt b/libs/index/src/androidInstrumentedTest/kotlin/org/fdroid/BestLocaleTest.kt
similarity index 100%
rename from libs/index/src/androidAndroidTest/kotlin/org/fdroid/BestLocaleTest.kt
rename to libs/index/src/androidInstrumentedTest/kotlin/org/fdroid/BestLocaleTest.kt
diff --git a/libs/index/src/androidAndroidTest/kotlin/org/fdroid/index/v1/IndexV1CreatorTest.kt b/libs/index/src/androidInstrumentedTest/kotlin/org/fdroid/index/v1/IndexV1CreatorTest.kt
similarity index 100%
rename from libs/index/src/androidAndroidTest/kotlin/org/fdroid/index/v1/IndexV1CreatorTest.kt
rename to libs/index/src/androidInstrumentedTest/kotlin/org/fdroid/index/v1/IndexV1CreatorTest.kt
diff --git a/libs/index/src/androidTest/kotlin/org/fdroid/CompatibilityCheckerTest.kt b/libs/index/src/androidUnitTest/kotlin/org/fdroid/CompatibilityCheckerTest.kt
similarity index 100%
rename from libs/index/src/androidTest/kotlin/org/fdroid/CompatibilityCheckerTest.kt
rename to libs/index/src/androidUnitTest/kotlin/org/fdroid/CompatibilityCheckerTest.kt
diff --git a/libs/index/src/androidTest/kotlin/org/fdroid/UpdateCheckerTest.kt b/libs/index/src/androidUnitTest/kotlin/org/fdroid/UpdateCheckerTest.kt
similarity index 100%
rename from libs/index/src/androidTest/kotlin/org/fdroid/UpdateCheckerTest.kt
rename to libs/index/src/androidUnitTest/kotlin/org/fdroid/UpdateCheckerTest.kt
diff --git a/libs/index/src/androidTest/kotlin/org/fdroid/index/IndexUtilsTest.kt b/libs/index/src/androidUnitTest/kotlin/org/fdroid/index/IndexUtilsTest.kt
similarity index 100%
rename from libs/index/src/androidTest/kotlin/org/fdroid/index/IndexUtilsTest.kt
rename to libs/index/src/androidUnitTest/kotlin/org/fdroid/index/IndexUtilsTest.kt
diff --git a/libs/index/src/androidTest/kotlin/org/fdroid/index/v1/IndexV1StreamProcessorTest.kt b/libs/index/src/androidUnitTest/kotlin/org/fdroid/index/v1/IndexV1StreamProcessorTest.kt
similarity index 100%
rename from libs/index/src/androidTest/kotlin/org/fdroid/index/v1/IndexV1StreamProcessorTest.kt
rename to libs/index/src/androidUnitTest/kotlin/org/fdroid/index/v1/IndexV1StreamProcessorTest.kt
diff --git a/libs/index/src/androidTest/kotlin/org/fdroid/index/v1/IndexV1VerifierTest.kt b/libs/index/src/androidUnitTest/kotlin/org/fdroid/index/v1/IndexV1VerifierTest.kt
similarity index 100%
rename from libs/index/src/androidTest/kotlin/org/fdroid/index/v1/IndexV1VerifierTest.kt
rename to libs/index/src/androidUnitTest/kotlin/org/fdroid/index/v1/IndexV1VerifierTest.kt
diff --git a/libs/index/src/androidTest/kotlin/org/fdroid/index/v2/EntryVerifierTest.kt b/libs/index/src/androidUnitTest/kotlin/org/fdroid/index/v2/EntryVerifierTest.kt
similarity index 100%
rename from libs/index/src/androidTest/kotlin/org/fdroid/index/v2/EntryVerifierTest.kt
rename to libs/index/src/androidUnitTest/kotlin/org/fdroid/index/v2/EntryVerifierTest.kt
diff --git a/libs/index/src/androidTest/kotlin/org/fdroid/index/v2/IndexV2FullStreamProcessorTest.kt b/libs/index/src/androidUnitTest/kotlin/org/fdroid/index/v2/IndexV2FullStreamProcessorTest.kt
similarity index 100%
rename from libs/index/src/androidTest/kotlin/org/fdroid/index/v2/IndexV2FullStreamProcessorTest.kt
rename to libs/index/src/androidUnitTest/kotlin/org/fdroid/index/v2/IndexV2FullStreamProcessorTest.kt
diff --git a/libs/index/src/androidTest/kotlin/org/fdroid/index/v2/ReflectionDifferTest.kt b/libs/index/src/androidUnitTest/kotlin/org/fdroid/index/v2/ReflectionDifferTest.kt
similarity index 100%
rename from libs/index/src/androidTest/kotlin/org/fdroid/index/v2/ReflectionDifferTest.kt
rename to libs/index/src/androidUnitTest/kotlin/org/fdroid/index/v2/ReflectionDifferTest.kt