Skip to content

Commit 71fbef9

Browse files
authored
[RKOTLIN-1100] Clean up build system (#1770)
1 parent 97f288c commit 71fbef9

File tree

153 files changed

+1013
-672
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

153 files changed

+1013
-672
lines changed

.gitignore

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -329,3 +329,11 @@ DerivedData/
329329

330330
# End of https://www.gitignore.io/api/c,git,c++,java,cmake,xcode,kotlin,android,intellij,visualstudiocode
331331
dynamic_libraries.properties
332+
333+
**/.kotlin
334+
335+
**/output
336+
337+
packages/test-sync/mongodb-realm/
338+
339+
packages/m2-buildrepo

CHANGELOG.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,11 +98,12 @@
9898
* Minimum Gradle version: 7.2.
9999
* Minimum Android Gradle Plugin version: 7.1.3.
100100
* Minimum Android SDK: 16.
101-
* Minimum R8: 8.0.34.
101+
* Minimum R8: 8.3.37.
102102

103103
### Internal
104104
* Updated to Realm Core 14.7.0 commit c280bdb17522323d5c30dc32a2b9efc9dc80ca3b.
105105
* Changed Kotlin compiler testing framework to https://github.com/zacsweers/kotlin-compile-testing
106+
* Updated to Detekt 1.23.6.
106107

107108

108109
## 1.16.0 (2024-05-01)

benchmarks/androidApp/build.gradle.kts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@ plugins {
55
}
66

77
android {
8+
namespace = "io.realm.kotlin.benchmarks.android"
9+
testNamespace = "io.realm.kotlin.benchmarks.android.test"
810
compileSdk = Versions.Android.compileSdkVersion
911

1012
compileOptions {

benchmarks/androidApp/src/androidTest/AndroidManifest.xml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
3-
xmlns:tools="http://schemas.android.com/tools"
4-
package="io.realm.kotlin.benchmarks.android.test">
3+
xmlns:tools="http://schemas.android.com/tools">
54

65
<!--
76
Important: disable debugging for accurate performance results
@@ -13,5 +12,5 @@
1312
android:debuggable="false"
1413
android:requestLegacyExternalStorage="true"
1514
tools:ignore="HardcodedDebugMode"
16-
tools:replace="android:debuggable" />
15+
/>
1716
</manifest>
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<manifest package="io.realm.kotlin.benchmarks.android" />
2+
<manifest/>

benchmarks/gradle.properties

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,3 +6,5 @@ kotlin.code.style=official
66

77
#Android
88
android.useAndroidX=true
9+
10+
kotlin.mpp.applyDefaultHierarchyTemplate=false

benchmarks/shared/build.gradle.kts

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ plugins {
88
version = "1.0"
99

1010
kotlin {
11-
android()
11+
androidTarget()
1212
jvm()
1313
// Disable iOS until needed
1414
// iosX64()
@@ -31,9 +31,6 @@ kotlin {
3131
implementation("io.realm.kotlin:library-sync:${Realm.version}")
3232
}
3333
}
34-
val main by creating {
35-
dependsOn(commonMain)
36-
}
3734
val androidMain by getting
3835
// Disable iOS until needed
3936
// val iosX64Main by getting
@@ -58,6 +55,7 @@ kotlin {
5855
}
5956

6057
android {
58+
namespace = "io.realm.kotlin.benchmarks"
6159
compileSdk = Versions.Android.compileSdkVersion
6260
sourceSets["main"].manifest.srcFile("src/androidMain/AndroidManifest.xml")
6361
defaultConfig {
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<manifest package="io.realm.kotlin.benchmarks" />
2+
<manifest/>

buildSrc/build.gradle.kts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,6 @@ dependencies {
5555
implementation("io.gitlab.arturbosch.detekt:detekt-gradle-plugin:${Versions.detektPlugin}")
5656
implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:${Versions.kotlin}")
5757
implementation("com.android.tools:r8:${Versions.Android.r8}")
58-
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
59-
implementation("com.android.tools.build:gradle-api:${Versions.Android.buildTools}")
58+
implementation("com.android.tools.build:gradle:${Versions.Android.buildTools}")
6059
implementation(kotlin("script-runtime"))
6160
}

buildSrc/gradle.properties

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
#
2+
# Copyright 2024 Realm Inc.
3+
#
4+
# Licensed under the Apache License, Version 2.0 (the "License");
5+
# you may not use this file except in compliance with the License.
6+
# You may obtain a copy of the License at
7+
#
8+
# http://www.apache.org/licenses/LICENSE-2.0
9+
#
10+
# Unless required by applicable law or agreed to in writing, software
11+
# distributed under the License is distributed on an "AS IS" BASIS,
12+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
# See the License for the specific language governing permissions and
14+
# limitations under the License.
15+
#
16+
kotlin.options.suppressFreeCompilerArgsModificationWarning=true

0 commit comments

Comments
 (0)