Update dependencies (#7)

* First drop to update dependencies
Includes Kotlin 2.1.20

* Re-enable sample apps

* Re-enable detekt

* Re-enable gradleVersionsPlugin and update more deps

* Update gradle wrapper to latest

* Enable dokka v2

* Update build script

* Update java toolchain

Author: mattmook

.editorconfig

@@ -42,3 +42,4 @@ ij_kotlin_wrap_expression_body_functions = 1
 indent_style = space
 indent_size = 4
 trim_trailing_whitespace = false
+max_line_length = 80

.github/workflows/build.yml

@@ -15,19 +15,28 @@ jobs:
     name: "Validation"
     runs-on: ubuntu-latest
     steps:
-     - uses: actions/checkout@v2
-     - uses: gradle/wrapper-validation-action@v1
+      - uses: actions/checkout@v4
+      - uses: gradle/actions/wrapper-validation@v3
 
   build:
     needs: [validation]
     runs-on: macOS-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
+      - uses: actions/setup-java@v4
+        with:
+            distribution: 'zulu'
+            java-version: '17'
+            cache: 'gradle'
+
+      - name: Setup Gradle
+        uses: gradle/actions/setup-gradle@v4
 
-      - name: Set up JDK 1.8
-        uses: actions/setup-java@v1
+      - name: konan cache
+        uses: actions/cache@v4
         with:
-          java-version: 1.8
+            path: ~/.konan
+            key: ${{ runner.os }}-konan
 
       - name: Check
         run: ./gradlew check
@@ -43,9 +52,5 @@ jobs:
         if: startsWith(github.ref, 'refs/tags/')
 
       - name: Upload tag
-        run: ./gradlew publish --no-daemon --no-parallel -Psigning.secretKeyRingFile=$(echo ~/.gradle/sonatype-appmattus-keys.gpg)
-        if: startsWith(github.ref, 'refs/tags/')
-
-      - name: Close and release tag
-        run: ./gradlew closeAndReleaseRepository
+        run: ./gradlew publishAllPublicationsToMavenCentral -Psigning.secretKeyRingFile=$(echo ~/.gradle/sonatype-appmattus-keys.gpg)
         if: startsWith(github.ref, 'refs/tags/')

.gitignore

@@ -300,3 +300,5 @@ fabric.properties
 !swiftlint-wrapper.jar
 
 # End of https://www.toptal.com/developers/gitignore/api/android,androidstudio,xcode,swift,kotlin
+
+.kotlin

README.md

@@ -23,8 +23,17 @@ distinguish between cellular vs WiFi connection.
 ![badge][badge-android]
 ![badge][badge-ios]
 
-[ignore-test](ignore-test/README.md): Annotations to ignore tests from
-specific platforms.  
+[ignore-ios](ignore-ios/README.md): Annotations to ignore iOS tests.  
+![badge][badge-android]
+![badge][badge-ios]
+![badge][badge-jvm]
+
+[ignore-junit](ignore-junit/README.md): Annotations to ignore JUnit 4 tests.  
+![badge][badge-android]
+![badge][badge-ios]
+![badge][badge-jvm]
+
+[ignore-junit5](ignore-junit5/README.md): Annotations to ignore JUnit 5 tests.  
 ![badge][badge-android]
 ![badge][badge-ios]
 ![badge][badge-jvm]

battery/README.md

@@ -17,7 +17,7 @@ commonMain {
 }
 ```
 
-Create an instance of Battery 
+Create an instance of Battery
 
 To create a hash first create a digest with `Digest.create` providing the name
 of the hash you wish to use, then update with `update` and create the hash with
@@ -35,8 +35,6 @@ val hash: ByteArray = digest.digest()
 digest.digest(byteArray)
 ```
 
-
-
 ---
 
 Inspired by the Flutter [battery](https://pub.dev/packages/battery) package.

battery/build.gradle.kts

@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 Appmattus Limited
+ * Copyright 2021-2025 Appmattus Limited
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,49 +14,52 @@
  * limitations under the License.
  */
 
-import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
-
 plugins {
-    kotlin("multiplatform")
     id("com.android.library")
-    id("com.vanniktech.maven.publish")
-    id("org.jetbrains.dokka")
+    kotlin("multiplatform")
+    alias(libs.plugins.gradleMavenPublishPlugin)
+    alias(libs.plugins.dokkaPlugin)
 }
 
 kotlin {
-    android()
-    ios()
+    androidTarget()
 
-    sourceSets {
-        val commonMain by getting {
-            dependencies {
-                implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core") {
-                    version {
-                        strictly(Versions.coroutinesNative)
-                    }
-                }
-            }
+    iosX64()
+    iosArm64()
+    iosSimulatorArm64()
+
+    listOf(
+        iosX64(),
+        iosArm64(),
+        iosSimulatorArm64()
+    ).forEach { iosTarget ->
+        iosTarget.binaries.framework {
+            baseName = "multiplatformutils-battery"
+            isStatic = true
         }
-        val commonTest by getting
-        val androidMain by getting {
-            dependencies {
-                implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:${Versions.coroutines}")
-            }
+    }
+
+    // Apply the default hierarchy again. It'll create, for example, the iosMain source set:
+    applyDefaultHierarchyTemplate()
+
+    sourceSets {
+        commonMain.dependencies {
+            implementation(libs.kotlinx.coroutines)
         }
-        val androidTest by getting
-        val iosMain by getting
-        val iosTest by getting
+    }
+
+    compilerOptions {
+        jvmToolchain(11)
+        freeCompilerArgs.add("-Xexpect-actual-classes")
     }
 }
 
 android {
-    compileSdkVersion(30)
-    sourceSets["main"].manifest.srcFile("src/androidMain/AndroidManifest.xml")
+    namespace = "com.appmattus.multiplatformutils.battery"
+    compileSdk = 35
+
     defaultConfig {
-        minSdkVersion(21)
-        targetSdkVersion(30)
-        versionCode = 1
-        versionName = "1.0"
+        minSdk = 21
     }
     buildTypes {
         getByName("release") {
@@ -65,9 +68,7 @@ android {
     }
 
     compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_1_8
-        targetCompatibility = JavaVersion.VERSION_1_8
+        sourceCompatibility = JavaVersion.VERSION_11
+        targetCompatibility = JavaVersion.VERSION_11
     }
 }
-
-tasks.withType<KotlinCompile> { kotlinOptions.jvmTarget = JavaVersion.VERSION_1_8.toString() }

battery/src/androidMain/AndroidManifest.xml

@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 Appmattus Limited
+ * Copyright 2021-2025 Appmattus Limited
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,12 +18,9 @@ package com.appmattus.battery
 
 import android.content.BroadcastReceiver
 import android.content.Context
-import android.content.ContextWrapper
 import android.content.Intent
 import android.content.IntentFilter
 import android.os.BatteryManager
-import android.os.Build.VERSION
-import android.os.Build.VERSION_CODES
 import com.appmattus.battery.ChargingStatus.Status.Charging
 import com.appmattus.battery.ChargingStatus.Status.Discharging
 import com.appmattus.battery.ChargingStatus.Status.Full
@@ -35,18 +32,11 @@ import kotlinx.coroutines.flow.callbackFlow
 actual class Battery(private val context: Context) {
 
     actual val batteryLevel: Int
-        get() = if (VERSION.SDK_INT >= VERSION_CODES.LOLLIPOP) {
+        get() {
             val batteryManager = context.getSystemService(Context.BATTERY_SERVICE) as BatteryManager
-            batteryManager.getIntProperty(BatteryManager.BATTERY_PROPERTY_CAPACITY)
-        } else {
-            val intent = ContextWrapper(context)
-                .registerReceiver(null, IntentFilter(Intent.ACTION_BATTERY_CHANGED))!!
-            @Suppress("MagicNumber")
-            (intent.getIntExtra(BatteryManager.EXTRA_LEVEL, -1) * 100 /
-                    intent.getIntExtra(BatteryManager.EXTRA_SCALE, -1))
+            return batteryManager.getIntProperty(BatteryManager.BATTERY_PROPERTY_CAPACITY)
         }
 
-    @Suppress("EXPERIMENTAL_API_USAGE")
     actual val chargingStatus: Flow<ChargingStatus>
         get() = callbackFlow {
             val receiver = object : BroadcastReceiver() {

battery/src/androidMain/kotlin/com/appmattus/battery/Battery.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 Appmattus Limited
+ * Copyright 2021-2025 Appmattus Limited
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -41,7 +41,6 @@ actual class Battery {
             }
         }
 
-    @Suppress("EXPERIMENTAL_API_USAGE")
     actual val chargingStatus: Flow<ChargingStatus>
         get() = callbackFlow {
             UIDevice.currentDevice.batteryMonitoringEnabled = true
@@ -63,13 +62,18 @@ actual class Battery {
         }
 
     companion object {
+        @Suppress("REDUNDANT_ELSE_IN_WHEN", "KotlinRedundantDiagnosticSuppress")
         private val UIDeviceBatteryState.asChargingStatus
-            get() = if (NSProcessInfo.processInfo.environment["SIMULATOR_DEVICE_NAME"] != null) ChargingStatus(Full) else when (this) {
-                UIDeviceBatteryState.UIDeviceBatteryStateCharging -> ChargingStatus(Charging)
-                UIDeviceBatteryState.UIDeviceBatteryStateFull -> ChargingStatus(Full)
-                UIDeviceBatteryState.UIDeviceBatteryStateUnplugged -> ChargingStatus(Discharging)
-                UIDeviceBatteryState.UIDeviceBatteryStateUnknown -> ChargingStatus(Unavailable)
-                else -> ChargingStatus(Unavailable)
+            get() = if (NSProcessInfo.processInfo.environment["SIMULATOR_DEVICE_NAME"] != null) {
+                ChargingStatus(Full)
+            } else {
+                when (this) {
+                    UIDeviceBatteryState.UIDeviceBatteryStateCharging -> ChargingStatus(Charging)
+                    UIDeviceBatteryState.UIDeviceBatteryStateFull -> ChargingStatus(Full)
+                    UIDeviceBatteryState.UIDeviceBatteryStateUnplugged -> ChargingStatus(Discharging)
+                    UIDeviceBatteryState.UIDeviceBatteryStateUnknown -> ChargingStatus(Unavailable)
+                    else -> ChargingStatus(Unavailable)
+                }
             }
 
         private const val BATTERY_MAX_VALUE = 100

battery/src/iosMain/kotlin/com/appmattus/battery/Battery.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 Appmattus Limited
+ * Copyright 2021-2025 Appmattus Limited
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,12 +15,13 @@
  */
 
 import io.gitlab.arturbosch.detekt.Detekt
+import java.time.ZonedDateTime
 
 plugins {
-    id("io.gitlab.arturbosch.detekt") version Versions.detektGradlePlugin
-    id("com.appmattus.markdown") version Versions.markdownlintGradlePlugin
-    id("com.vanniktech.maven.publish") version Versions.gradleMavenPublishPlugin apply false
-    id("org.jetbrains.dokka") version Versions.dokkaPlugin
+    alias(libs.plugins.detektGradlePlugin)
+    alias(libs.plugins.markdownlintGradlePlugin)
+    alias(libs.plugins.gradleMavenPublishPlugin) apply false
+    alias(libs.plugins.dokkaPlugin)
 }
 
 buildscript {
@@ -30,10 +31,10 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:${Versions.kotlin}")
-        classpath("com.android.tools.build:gradle:${Versions.androidGradlePlugin}")
-        classpath("com.google.dagger:hilt-android-gradle-plugin:${Versions.Google.dagger}")
-        classpath("androidx.navigation:navigation-safe-args-gradle-plugin:${Versions.AndroidX.navigation}")
+        classpath(libs.buildscript.android)
+        classpath(libs.buildscript.kotlin)
+        classpath(libs.buildscript.hilt)
+        classpath(libs.buildscript.safeargs)
     }
 }
 
@@ -44,26 +45,26 @@ allprojects {
         gradlePluginPortal()
         google()
         mavenCentral()
-        maven(url = "https://kotlin.bintray.com/kotlinx/")
+        maven { url = uri("https://jitpack.io") }
     }
 }
 
 dependencies {
-    detektPlugins("io.gitlab.arturbosch.detekt:detekt-formatting:${Versions.detektGradlePlugin}")
+    detektPlugins("io.gitlab.arturbosch.detekt:detekt-formatting:${libs.versions.detektGradlePlugin.get()}")
 }
 
 tasks.withType<Detekt> {
-    jvmTarget = "1.8"
+    jvmTarget = "11"
 }
 
 detekt {
-    input = files(subprojects.map { File(it.projectDir, "src") })
+    source.setFrom(files(subprojects.map { File(it.projectDir, "src") }))
 
     buildUponDefaultConfig = true
 
     autoCorrect = true
 
-    config = files("detekt-config.yml")
+    config.setFrom(files("detekt-config.yml"))
 }
 
 tasks.maybeCreate("check").dependsOn(tasks.named("detekt"))
@@ -74,20 +75,24 @@ allprojects {
     version = System.getenv("GITHUB_REF")?.substring(10) ?: System.getProperty("GITHUB_REF")?.substring(10) ?: "unknown"
 
     plugins.withType<org.jetbrains.dokka.gradle.DokkaPlugin> {
-        tasks.withType<org.jetbrains.dokka.gradle.DokkaTask>().configureEach {
+        dokka {
             dokkaSourceSets {
                 configureEach {
-                    if (name.startsWith("ios")) {
-                        displayName.set("ios")
-                    }
-
                     sourceLink {
                         localDirectory.set(rootDir)
-                        remoteUrl.set(java.net.URL("https://github.com/appmattus/multiplatform-utils/blob/main"))
+                        remoteUrl("https://github.com/appmattus/multiplatform-utils/blob/main")
                         remoteLineSuffix.set("#L")
                     }
                 }
             }
+
+            pluginsConfiguration.html {
+                footerMessage.set(
+                    provider {
+                        "Copyright © 2021-${ZonedDateTime.now().year} Appmattus Limited"
+                    }
+                )
+            }
         }
     }
 }