Kotlin Tooling Update (#159)

## Changes

- Set Kotlin language and api version to 1.7 to align with Nimbus Android
- Updated Android compileSdk to 35
- Enabled parallel configuration cache and incremental native support
- Enable iosArm64 and iosSimulatorArm64 on all builds

## Library Updates

- Android Gradle Plugin: 8.7.2
- Android Build Tools: Removed in favor of Android Gradle Plugin default
- Dokka 1.9.20
- Gradle: 8.11.1
- Kotlin Serialization: Prefer 1.7.3; Min 1.4 to align with Kotlin 1.7
- Kotest: 6.0.0.M1

.github/CODEOWNERS

@@ -1 +0,0 @@
-workflows/ @timehop/nimbus-admin

.gitignore

@@ -1,35 +1,52 @@
 # Standard
 bin/
-gen/
-classes/
 build/
+captures/
+classes/
+gen/
+schemas/
 .build/
-
-# Gradle
-.gradle
-
-# Windows / MacOS
+.externalNativeBuild/
+.gradle/
+.kotlin/
+.navigation/
+*.aab
+*.aar
+*.apk
+*.framework
+*.generated.swift
+*.hmap
+*.ipa
+*.keystore
+*.log
+*.xcframework
+*.zip
+
+# OS
 .DS_Store
 
-# Intellij / Android Studio / Rider
-*.iml
+# Intellij / Android Studio / Rider / Fleet
+.fleet/
 .idea/
-
-# Android
+.vscode/
+*Caches/
+xcuserdata/
+*.iml
+*.user
+*.xcworkspace
 local.properties
 
-# Cocoapods
-*.podspec
-
 # Nuget
+obj/
+packages/
 *.dll
 *.nupkg
 *.p7s
-obj/
-packages/
-
-# Rider
-*.user
-_ReSharper.Caches/
 
+# Cocoapods
+Pods/
+Podfile.lock
 
+# Swift Package Manager
+Packages/
+Package.resolved

gradle.properties

@@ -1,16 +1,17 @@
 # Project-wide Gradle settings.
-org.gradle.jvmargs=-Xmx6g -XX:+UseParallelGC -Dkotlin.daemon.jvm.options=-Xmx2g,XX:+UseParallelGC
+org.gradle.jvmargs=-Xmx6g -XX:+UseParallelGC -Dfile.encoding=UTF-8
 org.gradle.caching=true
 org.gradle.configureondemand=true
 org.gradle.parallel=true
 
 # The configuration cache remains disabled due to publishing tasks not working with it
 org.gradle.configuration-cache=true
+org.gradle.configuration-cache.parallel=true
 org.gradle.configuration-cache-problems=warn
 org.gradle.configuration-cache.max-problems=5
 
 group=com.adsbynimbus.openrtb
-version=0.13.0
+version=0.17.0
 
 ## Android Build Settings
 android.defaults.buildfeatures.resvalues=false
@@ -20,8 +21,8 @@ android.useAndroidX=true
 
 ## Kotlin Build Settings
 kotlin.code.style=official
-kotlin.daemon.jvmargs=-Xmx2g -XX:+UseParallelGC
+kotlin.daemon.jvmargs=-Xmx2g -XX:+UseParallelGC -Dfile.encoding=UTF-8
 kotlin.incremental.multiplatform=true
-kotlin.mpp.androidSourceSetLayoutVersion=2
+kotlin.incremental.native=true
 kotlin.native.ignoreDisabledTargets=true
 kotlin.stdlib.default.dependency=false

gradle/libs.versions.toml

@@ -1,10 +1,9 @@
 [versions]
-android = "8.6.0"
-android-buildtools = "34.0.0"
-dokka = "1.9.10"
-kotest = "5.8.0"
-kotlin = "2.0.20"
-serialization = { require = "[1.3.3, 2.0[", prefer = "1.7.2" }
+android = "8.7.2"
+dokka = "1.9.20"
+kotest = "6.0.0.M1"
+kotlin = "2.0.21"
+serialization = { require = "[1.4, 2.0[", prefer = "1.7.3" }
 
 [plugins]
 android = { id = "com.android.library", version.ref = "android" }

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

gradlew

@@ -15,6 +15,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
+# SPDX-License-Identifier: Apache-2.0
+#
 
 ##############################################################################
 #
@@ -55,7 +57,7 @@
 #       Darwin, MinGW, and NonStop.
 #
 #   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
 #       within the Gradle project.
 #
 #       You can find Gradle at https://github.com/gradle/gradle/.
@@ -84,7 +86,8 @@ done
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
 # Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
-APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
+APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
+' "$PWD" ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum

gradlew.bat

@@ -13,6 +13,8 @@
 @rem See the License for the specific language governing permissions and
 @rem limitations under the License.
 @rem
+@rem SPDX-License-Identifier: Apache-2.0
+@rem
 
 @if "%DEBUG%"=="" @echo off
 @rem ##########################################################################

kotlin/build.gradle.kts

@@ -1,4 +1,5 @@
 import org.jetbrains.dokka.gradle.DokkaTask
+import org.jetbrains.kotlin.gradle.dsl.*
 
 plugins {
     alias(libs.plugins.android)
@@ -9,12 +10,8 @@ plugins {
     `maven-publish`
 }
 
-val androidOnly: Boolean = providers.gradleProperty("android.injected.invoked.from.ide")
-    .map { it.toBoolean() }.getOrElse(false)
-
 android {
-    buildToolsVersion = libs.versions.android.buildtools.get()
-    compileSdk = 34
+    compileSdk = 35
     defaultConfig {
         minSdk = 21
         consumerProguardFile("src/androidMain/consumer-proguard-rules.pro")
@@ -24,27 +21,24 @@ android {
 
 kotlin {
     explicitApi()
-    applyDefaultHierarchyTemplate()
 
     androidTarget {
-        compilations.all {
-            kotlinOptions {
-                jvmTarget = "1.8"
+        compilations.configureEach {
+            compileTaskProvider.configure {
+                compilerOptions.jvmTarget = JvmTarget.JVM_1_8
             }
         }
         publishLibraryVariants("release")
     }
 
-    /* Apple deployments in rough dependency order */
-    if (!androidOnly) {
-        iosArm64()
-        iosSimulatorArm64()
-    }
+    iosArm64()
+    iosSimulatorArm64()
+
     sourceSets {
         configureEach {
             languageSettings {
-                apiVersion = "1.6"
-                languageVersion = "1.6"
+                apiVersion = KotlinVersion.KOTLIN_1_7.version
+                languageVersion = KotlinVersion.KOTLIN_1_7.version
                 optIn("kotlinx.serialization.ExperimentalSerializationApi")
             }
         }
@@ -54,10 +48,8 @@ kotlin {
         commonTest.dependencies {
             implementation(libs.bundles.test.common)
         }
-        val androidUnitTest by getting {
-            dependencies {
-                implementation(libs.bundles.test.android)
-            }
+        androidUnitTest.dependencies {
+            implementation(libs.bundles.test.android)
         }
     }
 }

settings.gradle.kts

@@ -2,17 +2,36 @@
 
 pluginManagement {
     repositories {
-        google()
+        google {
+            mavenContent {
+                includeGroupAndSubgroups("androidx")
+                includeGroupAndSubgroups("com.android")
+                includeGroupAndSubgroups("com.google")
+            }
+        }
         mavenCentral()
         gradlePluginPortal()
     }
 }
 
+val androidGradleOverride = with(providers) {
+    gradleProperty("android.studio.version").flatMap { gradleProperty("android.gradle") }
+}
+
 dependencyResolutionManagement {
     repositories {
-        google()
+        google {
+            mavenContent {
+                includeGroupAndSubgroups("androidx")
+                includeGroupAndSubgroups("com.android")
+                includeGroupAndSubgroups("com.google")
+            }
+        }
         mavenCentral()
     }
+    versionCatalogs.configureEach {
+          if (androidGradleOverride.isPresent) version("android", androidGradleOverride.get())
+    }
 }
 
 rootProject.name = "nimbus-openrtb"