[RKOTLIN-1100] Clean up build system (#1770)

realm · Jun 20, 2024 · 71fbef9 · 71fbef9
1 parent 97f288c
commit 71fbef9
Show file tree

Hide file tree

Showing 153 changed files with 1,013 additions and 672 deletions.
diff --git a/.gitignore b/.gitignore
@@ -329,3 +329,11 @@ DerivedData/
 
 # End of https://www.gitignore.io/api/c,git,c++,java,cmake,xcode,kotlin,android,intellij,visualstudiocode
 dynamic_libraries.properties
+
+**/.kotlin
+
+**/output
+
+packages/test-sync/mongodb-realm/
+
+packages/m2-buildrepo
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -98,11 +98,12 @@
 * Minimum Gradle version: 7.2.
 * Minimum Android Gradle Plugin version: 7.1.3.
 * Minimum Android SDK: 16.
-* Minimum R8: 8.0.34.
+* Minimum R8: 8.3.37.
 
 ### Internal
 * Updated to Realm Core 14.7.0 commit c280bdb17522323d5c30dc32a2b9efc9dc80ca3b.
 * Changed Kotlin compiler testing framework to https://github.com/zacsweers/kotlin-compile-testing
+* Updated to Detekt 1.23.6.
 
 
 ## 1.16.0 (2024-05-01)

diff --git a/benchmarks/androidApp/build.gradle.kts b/benchmarks/androidApp/build.gradle.kts
@@ -5,6 +5,8 @@ plugins {
 }
 
 android {
+    namespace = "io.realm.kotlin.benchmarks.android"
+    testNamespace = "io.realm.kotlin.benchmarks.android.test"
     compileSdk = Versions.Android.compileSdkVersion
 
     compileOptions {

diff --git a/benchmarks/androidApp/src/androidTest/AndroidManifest.xml b/benchmarks/androidApp/src/androidTest/AndroidManifest.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    package="io.realm.kotlin.benchmarks.android.test">
+    xmlns:tools="http://schemas.android.com/tools">
 
     <!--
       Important: disable debugging for accurate performance results
@@ -13,5 +12,5 @@
         android:debuggable="false"
         android:requestLegacyExternalStorage="true"
         tools:ignore="HardcodedDebugMode"
-        tools:replace="android:debuggable" />
+        />
 </manifest>
diff --git a/benchmarks/androidApp/src/main/AndroidManifest.xml b/benchmarks/androidApp/src/main/AndroidManifest.xml
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest package="io.realm.kotlin.benchmarks.android" />
+<manifest/>
diff --git a/benchmarks/gradle.properties b/benchmarks/gradle.properties
@@ -6,3 +6,5 @@ kotlin.code.style=official
 
 #Android
 android.useAndroidX=true
+
+kotlin.mpp.applyDefaultHierarchyTemplate=false
diff --git a/benchmarks/shared/build.gradle.kts b/benchmarks/shared/build.gradle.kts
@@ -8,7 +8,7 @@ plugins {
 version = "1.0"
 
 kotlin {
-    android()
+    androidTarget()
     jvm()
 // Disable iOS until needed
 //    iosX64()
@@ -31,9 +31,6 @@ kotlin {
                 implementation("io.realm.kotlin:library-sync:${Realm.version}")
             }
         }
-        val main by creating {
-            dependsOn(commonMain)
-        }
         val androidMain by getting
 // Disable iOS until needed
 //        val iosX64Main by getting
@@ -58,6 +55,7 @@ kotlin {
 }
 
 android {
+    namespace = "io.realm.kotlin.benchmarks"
     compileSdk = Versions.Android.compileSdkVersion
     sourceSets["main"].manifest.srcFile("src/androidMain/AndroidManifest.xml")
     defaultConfig {

diff --git a/benchmarks/shared/src/androidMain/AndroidManifest.xml b/benchmarks/shared/src/androidMain/AndroidManifest.xml
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest package="io.realm.kotlin.benchmarks" />
+<manifest/>
diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
@@ -55,7 +55,6 @@ dependencies {
     implementation("io.gitlab.arturbosch.detekt:detekt-gradle-plugin:${Versions.detektPlugin}")
     implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:${Versions.kotlin}")
     implementation("com.android.tools:r8:${Versions.Android.r8}")
-    implementation("com.android.tools.build:gradle:${Versions.Android.buildTools}") // TODO LATER Don't know why this has to be here. See if we can remove this
-    implementation("com.android.tools.build:gradle-api:${Versions.Android.buildTools}")
+    implementation("com.android.tools.build:gradle:${Versions.Android.buildTools}")
     implementation(kotlin("script-runtime"))
 }
diff --git a/buildSrc/gradle.properties b/buildSrc/gradle.properties
@@ -0,0 +1,16 @@
+#
+# Copyright 2024 Realm Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+kotlin.options.suppressFreeCompilerArgsModificationWarning=true
diff --git a/buildSrc/src/main/kotlin/Config.kt b/buildSrc/src/main/kotlin/Config.kt
@@ -103,7 +103,7 @@ object Versions {
         const val buildToolsVersion = "33.0.0"
         const val buildTools = "7.3.1" // https://maven.google.com/web/index.html?q=gradle#com.android.tools.build:gradle
         const val ndkVersion = "23.2.8568313"
-        const val r8 = "8.0.34" // See https://developer.android.com/build/kotlin-support
+        const val r8 = "8.3.37" // See https://developer.android.com/build/kotlin-support
     }
     const val androidxBenchmarkPlugin = "1.2.0-alpha12" // https://maven.google.com/web/index.html#androidx.benchmark:androidx.benchmark.gradle.plugin
     const val androidxStartup = "1.1.1" // https://maven.google.com/web/index.html?q=startup#androidx.startup:startup-runtime
@@ -115,7 +115,7 @@ object Versions {
     const val buildkonfig = "0.13.3" // https://github.com/yshrsmz/BuildKonfig
     const val coroutines = "1.7.0" // https://mvnrepository.com/artifact/org.jetbrains.kotlinx/kotlinx-coroutines-core
     const val datetime = "0.4.0" // https://github.com/Kotlin/kotlinx-datetime
-    const val detektPlugin = "1.22.0-RC2" // https://github.com/detekt/detekt
+    const val detektPlugin = "1.23.6" // https://github.com/detekt/detekt
     const val dokka = "1.9.0" // https://github.com/Kotlin/dokka
     const val gradlePluginPublishPlugin = "0.15.0" // https://plugins.gradle.org/plugin/com.gradle.plugin-publish
     const val jmh = "1.34" // https://github.com/openjdk/jmh

diff --git a/buildSrc/src/main/kotlin/realm-lint.gradle.kts b/buildSrc/src/main/kotlin/realm-lint.gradle.kts
@@ -15,6 +15,8 @@
  * limitations under the License.
  */
 
+import io.gitlab.arturbosch.detekt.Detekt
+import io.gitlab.arturbosch.detekt.extensions.DetektReports
 import java.nio.file.Files
 import java.nio.file.Paths
 
@@ -86,30 +88,36 @@ allprojects {
 
     detekt {
         buildUponDefaultConfig = true // preconfigure defaults
-        config = files("$configDir/detekt/detekt.yml") // point to your custom config defining rules to run, overwriting default behavior
+        config.from(files("$configDir/detekt/detekt.yml")) // point to your custom config defining rules to run, overwriting default behavior
         baseline = file("$configDir/detekt/baseline.xml") // a way of suppressing issues before introducing detekt
-        input = files(
-            file("src/androidMain/kotlin"),
-            file("src/androidAndroidTest/kotlin"),
-            file("src/androidTest/kotlin"),
-            file("src/commonMain/kotlin"),
-            file("src/commonTest/kotlin"),
-            file("src/darwin/kotlin"),
-            file("src/ios/kotlin"),
-            file("src/iosMain/kotlin"),
-            file("src/iosTest/kotlin"),
-            file("src/jvm/kotlin"),
-            file("src/jvmMain/kotlin"),
-            file("src/main/kotlin"),
-            file("src/macosMain/kotlin"),
-            file("src/macosTest/kotlin"),
-            file("src/test/kotlin")
+        source.files.addAll(
+            files(
+                file("src/androidMain/kotlin"),
+                file("src/androidAndroidTest/kotlin"),
+                file("src/androidTest/kotlin"),
+                file("src/commonMain/kotlin"),
+                file("src/commonTest/kotlin"),
+                file("src/darwin/kotlin"),
+                file("src/ios/kotlin"),
+                file("src/iosMain/kotlin"),
+                file("src/iosTest/kotlin"),
+                file("src/jvm/kotlin"),
+                file("src/jvmMain/kotlin"),
+                file("src/main/kotlin"),
+                file("src/macosMain/kotlin"),
+                file("src/macosTest/kotlin"),
+                file("src/test/kotlin")
+            )
         )
 
-        reports {
-            html.enabled = true // observe findings in your browser with structure and code snippets
-            xml.enabled = false // checkstyle like format mainly for integrations like GHA
-            txt.enabled = false // similar to the console output, contains issue signature to manually edit baseline files
+        tasks.withType<Detekt>().configureEach {
+            reports {
+                xml.required.set(true)
+                html.required.set(true)
+                txt.required.set(true)
+                sarif.required.set(true)
+                md.required.set(true)
+            }
         }
     }
 }
diff --git a/config/detekt/detekt.yml b/config/detekt/detekt.yml
@@ -310,7 +310,6 @@ naming:
   BooleanPropertyNaming:
     active: false
     allowedPattern: '^(is|has|are)'
-    ignoreOverridden: true
   ClassNaming:
     active: true
     excludes: ['**/test/**', '**/androidTest/**', '**/androidAndroidTest/**', '**/commonTest/**', '**/jvmTest/**', '**/jsTest/**', '**/iosTest/**']
@@ -321,7 +320,6 @@ naming:
     parameterPattern: '[a-z][A-Za-z0-9]*'
     privateParameterPattern: '[a-z][A-Za-z0-9]*'
     excludeClassPattern: '$^'
-    ignoreOverridden: true
   EnumNaming:
     active: true
     excludes: ['**/test/**', '**/androidTest/**', '**/androidAndroidTest/**', '**/commonTest/**', '**/jvmTest/**', '**/jsTest/**', '**/iosTest/**']
@@ -343,13 +341,11 @@ naming:
     excludes: ['**/test/**', '**/androidTest/**', '**/androidAndroidTest/**', '**/commonTest/**', '**/jvmTest/**', '**/jsTest/**', '**/iosTest/**']
     functionPattern: '[a-z][a-zA-Z0-9]*'
     excludeClassPattern: '$^'
-    ignoreOverridden: true
   FunctionParameterNaming:
     active: true
     excludes: ['**/test/**', '**/androidTest/**', '**/androidAndroidTest/**', '**/commonTest/**', '**/jvmTest/**', '**/jsTest/**', '**/iosTest/**']
     parameterPattern: '[a-z][A-Za-z0-9]*'
     excludeClassPattern: '$^'
-    ignoreOverridden: true
   InvalidPackageDeclaration:
     active: true
     rootPackage: ''
@@ -398,8 +394,7 @@ naming:
     variablePattern: '[a-z][A-Za-z0-9]*'
     privateVariablePattern: '(_)?[a-z][A-Za-z0-9]*'
     excludeClassPattern: '$^'
-    ignoreOverridden: true
-
+# 
 performance:
   active: true
   ArrayPrimitive:
@@ -549,12 +544,14 @@ style:
     includeLineWrapping: false
   ForbiddenComment:
     active: true
-    values:
-      - 'FIXME:'
-      - 'STOPSHIP:'
-      - 'TODO:'
+    comments:
+    - reason: 'Forbidden FIXME todo marker in comment, please fix the problem.'
+      value: 'FIXME:'
+    - reason: 'Forbidden STOPSHIP todo marker in comment, please fix the problem.'
+      value: 'STOPSHIP:'
+    - reason: 'Forbidden TODO todo marker in comment, please fix the problem.'
+      value: 'TODO:'
     allowedPatterns: ''
-    customMessage: ''
   ForbiddenImport:
     active: false
     imports: []
@@ -599,7 +596,7 @@ style:
     ignoreEnums: false
     ignoreRanges: false
     ignoreExtensionFunctions: true
-  MandatoryBracesIfStatements:
+  BracesOnIfStatements:
     active: false
   MandatoryBracesLoops:
     active: false
@@ -636,7 +633,7 @@ style:
     active: true
   OptionalUnit:
     active: false
-  OptionalWhenBraces:
+  BracesOnWhenStatements:
     active: false
   PreferToOverPairSyntax:
     active: false

diff --git a/examples/kmm-sample/androidApp/build.gradle.kts b/examples/kmm-sample/androidApp/build.gradle.kts
@@ -46,12 +46,12 @@ android {
         }
     }
 
-    compileSdkVersion(Versions.Android.compileSdkVersion)
+    compileSdk = Versions.Android.compileSdkVersion
     defaultConfig {
         applicationId = "io.realm.example.kmmsample.androidApp"
         // FIXME Use Versions.Android.minSdk when it is aligned in the SDK
-        minSdkVersion(21)
-        targetSdkVersion(Versions.Android.targetSdk)
+        minSdk = 21
+        targetSdk = Versions.Android.targetSdk
         versionCode = 1
         versionName = "$version"
     }

diff --git a/...kmm-sample/androidApp/src/main/java/io/realm/example/kmmsample/androidApp/MainActivity.kt b/...kmm-sample/androidApp/src/main/java/io/realm/example/kmmsample/androidApp/MainActivity.kt
@@ -42,10 +42,6 @@ class MainActivity : AppCompatActivity() {
                     sumTV.text = "= 🤔"
                 }
             }
-
-            override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) {}
-
-            override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) {}
         }
 
         countTV.text = "History count: ${Calculator.history().size}"

diff --git a/examples/kmm-sample/gradle.properties b/examples/kmm-sample/gradle.properties
@@ -20,8 +20,6 @@ org.gradle.jvmargs=-Xms512m -Xmx2048m
 kotlin.code.style=official
 xcodeproj=./iosApp
 android.useAndroidX=true
-kotlin.mpp.enableGranularSourceSetsMetadata=true
-kotlin.native.enableDependencyPropagation=false
-
+kotlin.mpp.applyDefaultHierarchyTemplate=false
 kotlin.mpp.stability.nowarn=true
 kotlin.mpp.androidSourceSetLayoutVersion1.nowarn=true
diff --git a/examples/kmm-sample/shared/build.gradle.kts b/examples/kmm-sample/shared/build.gradle.kts
@@ -32,7 +32,7 @@ configurations.all {
 
 kotlin {
     jvm()
-    android()
+    androidTarget()
     val iosTarget: (String, KotlinNativeTarget.() -> Unit) -> KotlinNativeTarget = when {
         System.getenv("SDK_NAME")?.startsWith("iphoneos") == true -> ::iosArm64
         System.getenv("NATIVE_ARCH")?.startsWith("arm") == true -> ::iosSimulatorArm64
@@ -75,11 +75,11 @@ kotlin {
     }
 }
 android {
-    compileSdkVersion(Versions.Android.compileSdkVersion)
+    compileSdk = Versions.Android.compileSdkVersion
     sourceSets["main"].manifest.srcFile("src/androidMain/AndroidManifest.xml")
     defaultConfig {
-        minSdkVersion(Versions.Android.minSdk)
-        targetSdkVersion(Versions.Android.targetSdk)
+        minSdk = Versions.Android.minSdk
+        targetSdk = Versions.Android.targetSdk
     }
     buildTypes {
         getByName("release") {

diff --git a/.../example/kmmsample/GreetingTestAndroid.kt → .../example/kmmsample/GreetingTestAndroid.kt b/.../example/kmmsample/GreetingTestAndroid.kt → .../example/kmmsample/GreetingTestAndroid.kt
diff --git a/examples/min-android-sample/app/build.gradle.kts b/examples/min-android-sample/app/build.gradle.kts
@@ -4,11 +4,11 @@ plugins {
 }
 
 android {
-    compileSdkVersion(31)
+    compileSdk = 31
     defaultConfig {
         applicationId = "io.realm.example.minandroidsample.android"
-        minSdkVersion(16)
-        targetSdkVersion(31)
+        minSdk = 16
+        targetSdk = 31
         versionCode = 1
         versionName = "1.0"
     }

diff --git a/examples/min-android-sample/build.gradle.kts b/examples/min-android-sample/build.gradle.kts
@@ -12,6 +12,7 @@ buildscript {
         gradlePluginPortal()
         google()
         mavenCentral()
+        maven(url = "https://oss.sonatype.org/content/repositories/snapshots")
     }
     dependencies {
         classpath("com.android.tools.build:gradle:7.1.3")
@@ -29,5 +30,6 @@ allprojects {
         maven(url = "file://${rootProject.rootDir.absolutePath}/../../packages/build/m2-buildrepo")
         google()
         mavenCentral()
+        maven(url = "https://oss.sonatype.org/content/repositories/snapshots")
     }
 }