Merge pull request #30 from ahmedre/update_deps_and_copyright

Update dependencies and copyright year
ahmedre · Nov 28, 2024 · febc52f · febc52f
2 parents 045896e + 7021c67
commit febc52f
Show file tree

Hide file tree

Showing 87 changed files with 538 additions and 752 deletions.
diff --git a/LICENSE b/LICENSE
@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2023 Ahmed El-Helw and Abdulahi Osoble
+Copyright (c) 2024 Ahmed El-Helw and Abdulahi Osoble
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

diff --git a/build-logic/convention/build.gradle.kts b/build-logic/convention/build.gradle.kts
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2023 Ahmed El-Helw and Abdulahi Osoble
+ * Copyright (c) 2024 Ahmed El-Helw and Abdulahi Osoble
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.

diff --git a/build-logic/convention/src/main/kotlin/convention.spotless.gradle.kts b/build-logic/convention/src/main/kotlin/convention.spotless.gradle.kts
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2023 Ahmed El-Helw and Abdulahi Osoble
+ * Copyright (c) 2024 Ahmed El-Helw and Abdulahi Osoble
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.

diff --git a/build-logic/gradle/wrapper/gradle-wrapper.properties b/build-logic/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
-zipStorePath=wrapper/dists
+zipStorePath=wrapper/dists
diff --git a/build-logic/settings.gradle.kts b/build-logic/settings.gradle.kts
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2023 Ahmed El-Helw and Abdulahi Osoble
+ * Copyright (c) 2024 Ahmed El-Helw and Abdulahi Osoble
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.

diff --git a/build.gradle.kts b/build.gradle.kts
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2023 Ahmed El-Helw and Abdulahi Osoble
+ * Copyright (c) 2024 Ahmed El-Helw and Abdulahi Osoble
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.

diff --git a/catalog/build.gradle.kts b/catalog/build.gradle.kts
@@ -1,18 +1,13 @@
 /**
- * Copyright (c) 2023 Ahmed El-Helw and Abdulahi Osoble
+ * Copyright (c) 2024 Ahmed El-Helw and Abdulahi Osoble
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  */
-import org.jetbrains.kotlin.gradle.targets.js.dsl.ExperimentalWasmDsl
+import org.jetbrains.kotlin.gradle.ExperimentalWasmDsl
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 import org.jetbrains.kotlin.gradle.targets.js.webpack.KotlinWebpackConfig
 
-/**
- * Copyright (c) 2023 Ahmed El-Helw and Abdulahi Osoble
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- */
 plugins {
     alias(libs.plugins.kotlin.multiplatform)
     alias(libs.plugins.android.application)
@@ -48,10 +43,8 @@ kotlin {
     }
 
     androidTarget {
-        compilations.all {
-            kotlinOptions {
-                jvmTarget = "1.8"
-            }
+        compilerOptions {
+            jvmTarget.set(JvmTarget.JVM_1_8)
         }
     }
 
@@ -105,17 +98,15 @@ kotlin {
         }
 
         val wasmJsMain by getting {
-            dependsOn(commonMain)
             resources.srcDirs("src/commonRes", "../sdui/src/commonRes")
             dependencies {
                 implementation(projects.design)
                 implementation(compose.ui)
 
-                val wasmKtor = "3.0.0-wasm1"
-                implementation("io.ktor:ktor-client-core:$wasmKtor")
-                implementation("io.ktor:ktor-serialization-kotlinx-json:$wasmKtor")
-                implementation("io.ktor:ktor-client-content-negotiation:$wasmKtor")
-                implementation("io.ktor:ktor-client-logging:$wasmKtor")
+                implementation(libs.ktor.client.core)
+                implementation(libs.ktor.serialization.json)
+                implementation(libs.ktor.client.contentNegotiation)
+                implementation(libs.ktor.client.logging)
             }
         }
     }
@@ -135,13 +126,12 @@ android {
     defaultConfig {
         applicationId = "dev.helw.playground.sdui.android"
         minSdk = 21
-        targetSdk = 34
+        targetSdk = 35
         versionCode = 1
         versionName = "1.0"
     }
 
     buildFeatures.compose = true
-    composeOptions.kotlinCompilerExtensionVersion = libs.versions.compose.compiler.get()
 
     packaging {
         resources {
@@ -169,6 +159,4 @@ compose {
             macOS.bundleID = "dev.helw.playground.sdui"
         }
     }
-
-    experimental.web.application {}
 }
diff --git a/catalog/src/androidMain/AndroidManifest.xml b/catalog/src/androidMain/AndroidManifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-     Copyright (c) 2023 Ahmed El-Helw and Abdulahi Osoble
+     Copyright (c) 2024 Ahmed El-Helw and Abdulahi Osoble
 
      This source code is licensed under the MIT license found in the
      LICENSE file in the root directory of this source tree.

diff --git a/catalog/src/androidMain/kotlin/dev/helw/playground/sdui/MainActivity.kt b/catalog/src/androidMain/kotlin/dev/helw/playground/sdui/MainActivity.kt
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2023 Ahmed El-Helw and Abdulahi Osoble
+ * Copyright (c) 2024 Ahmed El-Helw and Abdulahi Osoble
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.

diff --git a/catalog/src/androidMain/kotlin/dev/helw/playground/sdui/network/SduiClient.android.kt b/catalog/src/androidMain/kotlin/dev/helw/playground/sdui/network/SduiClient.android.kt
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2023 Ahmed El-Helw and Abdulahi Osoble
+ * Copyright (c) 2024 Ahmed El-Helw and Abdulahi Osoble
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.

diff --git a/catalog/src/androidMain/res/values/styles.xml b/catalog/src/androidMain/res/values/styles.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-     Copyright (c) 2023 Ahmed El-Helw and Abdulahi Osoble
+     Copyright (c) 2024 Ahmed El-Helw and Abdulahi Osoble
 
      This source code is licensed under the MIT license found in the
      LICENSE file in the root directory of this source tree.

diff --git a/catalog/src/commonMain/kotlin/dev/helw/playground/sdui/ColorScene.kt b/catalog/src/commonMain/kotlin/dev/helw/playground/sdui/ColorScene.kt
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2023 Ahmed El-Helw and Abdulahi Osoble
+ * Copyright (c) 2024 Ahmed El-Helw and Abdulahi Osoble
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.

diff --git a/catalog/src/commonMain/kotlin/dev/helw/playground/sdui/CompositionLocals.kt b/catalog/src/commonMain/kotlin/dev/helw/playground/sdui/CompositionLocals.kt
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2023 Ahmed El-Helw and Abdulahi Osoble
+ * Copyright (c) 2024 Ahmed El-Helw and Abdulahi Osoble
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.

diff --git a/catalog/src/commonMain/kotlin/dev/helw/playground/sdui/FullScreenDemo.kt b/catalog/src/commonMain/kotlin/dev/helw/playground/sdui/FullScreenDemo.kt
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2023 Ahmed El-Helw and Abdulahi Osoble
+ * Copyright (c) 2024 Ahmed El-Helw and Abdulahi Osoble
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.

diff --git a/catalog/src/commonMain/kotlin/dev/helw/playground/sdui/IconScene.kt b/catalog/src/commonMain/kotlin/dev/helw/playground/sdui/IconScene.kt
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2023 Ahmed El-Helw and Abdulahi Osoble
+ * Copyright (c) 2024 Ahmed El-Helw and Abdulahi Osoble
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.

diff --git a/catalog/src/commonMain/kotlin/dev/helw/playground/sdui/MainDemo.kt b/catalog/src/commonMain/kotlin/dev/helw/playground/sdui/MainDemo.kt
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2023 Ahmed El-Helw and Abdulahi Osoble
+ * Copyright (c) 2024 Ahmed El-Helw and Abdulahi Osoble
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.

diff --git a/catalog/src/commonMain/kotlin/dev/helw/playground/sdui/NativeListScene.kt b/catalog/src/commonMain/kotlin/dev/helw/playground/sdui/NativeListScene.kt
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2023 Ahmed El-Helw and Abdulahi Osoble
+ * Copyright (c) 2024 Ahmed El-Helw and Abdulahi Osoble
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.

diff --git a/catalog/src/commonMain/kotlin/dev/helw/playground/sdui/Navigation.kt b/catalog/src/commonMain/kotlin/dev/helw/playground/sdui/Navigation.kt
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2023 Ahmed El-Helw and Abdulahi Osoble
+ * Copyright (c) 2024 Ahmed El-Helw and Abdulahi Osoble
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.

diff --git a/catalog/src/commonMain/kotlin/dev/helw/playground/sdui/ProgressStatusScene.kt b/catalog/src/commonMain/kotlin/dev/helw/playground/sdui/ProgressStatusScene.kt
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2023 Ahmed El-Helw and Abdulahi Osoble
+ * Copyright (c) 2024 Ahmed El-Helw and Abdulahi Osoble
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.

diff --git a/catalog/src/commonMain/kotlin/dev/helw/playground/sdui/SandboxScene.kt b/catalog/src/commonMain/kotlin/dev/helw/playground/sdui/SandboxScene.kt
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2023 Ahmed El-Helw and Abdulahi Osoble
+ * Copyright (c) 2024 Ahmed El-Helw and Abdulahi Osoble
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.

diff --git a/catalog/src/commonMain/kotlin/dev/helw/playground/sdui/ServerDrivenUiScene.kt b/catalog/src/commonMain/kotlin/dev/helw/playground/sdui/ServerDrivenUiScene.kt
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2023 Ahmed El-Helw and Abdulahi Osoble
+ * Copyright (c) 2024 Ahmed El-Helw and Abdulahi Osoble
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.

diff --git a/catalog/src/commonMain/kotlin/dev/helw/playground/sdui/SizeScene.kt b/catalog/src/commonMain/kotlin/dev/helw/playground/sdui/SizeScene.kt
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2023 Ahmed El-Helw and Abdulahi Osoble
+ * Copyright (c) 2024 Ahmed El-Helw and Abdulahi Osoble
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.

diff --git a/catalog/src/commonMain/kotlin/dev/helw/playground/sdui/TypographyScene.kt b/catalog/src/commonMain/kotlin/dev/helw/playground/sdui/TypographyScene.kt
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2023 Ahmed El-Helw and Abdulahi Osoble
+ * Copyright (c) 2024 Ahmed El-Helw and Abdulahi Osoble
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.

diff --git a/catalog/src/commonMain/kotlin/dev/helw/playground/sdui/network/SduiClient.kt b/catalog/src/commonMain/kotlin/dev/helw/playground/sdui/network/SduiClient.kt
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2023 Ahmed El-Helw and Abdulahi Osoble
+ * Copyright (c) 2024 Ahmed El-Helw and Abdulahi Osoble
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.

diff --git a/catalog/src/desktopMain/kotlin/dev/helw/playground/sdui/DesktopDemoApp.kt b/catalog/src/desktopMain/kotlin/dev/helw/playground/sdui/DesktopDemoApp.kt
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2023 Ahmed El-Helw and Abdulahi Osoble
+ * Copyright (c) 2024 Ahmed El-Helw and Abdulahi Osoble
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.

diff --git a/catalog/src/desktopMain/kotlin/dev/helw/playground/sdui/network/SduiClient.desktop.kt b/catalog/src/desktopMain/kotlin/dev/helw/playground/sdui/network/SduiClient.desktop.kt
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2023 Ahmed El-Helw and Abdulahi Osoble
+ * Copyright (c) 2024 Ahmed El-Helw and Abdulahi Osoble
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.

diff --git a/catalog/src/jsMain/kotlin/dev/helw/playground/sdui/Main.kt b/catalog/src/jsMain/kotlin/dev/helw/playground/sdui/Main.kt
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2023 Ahmed El-Helw and Abdulahi Osoble
+ * Copyright (c) 2024 Ahmed El-Helw and Abdulahi Osoble
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.

diff --git a/catalog/src/jsMain/kotlin/dev/helw/playground/sdui/network/SduiClient.js.kt b/catalog/src/jsMain/kotlin/dev/helw/playground/sdui/network/SduiClient.js.kt
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2023 Ahmed El-Helw and Abdulahi Osoble
+ * Copyright (c) 2024 Ahmed El-Helw and Abdulahi Osoble
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.

diff --git a/catalog/src/wasmJsMain/kotlin/dev/helw/playground/sdui/Main.kt b/catalog/src/wasmJsMain/kotlin/dev/helw/playground/sdui/Main.kt
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2023 Ahmed El-Helw and Abdulahi Osoble
+ * Copyright (c) 2024 Ahmed El-Helw and Abdulahi Osoble
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.

diff --git a/catalog/src/wasmJsMain/kotlin/dev/helw/playground/sdui/network/SduiClient.wasmJs.kt b/catalog/src/wasmJsMain/kotlin/dev/helw/playground/sdui/network/SduiClient.wasmJs.kt
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2023 Ahmed El-Helw and Abdulahi Osoble
+ * Copyright (c) 2024 Ahmed El-Helw and Abdulahi Osoble
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.

diff --git a/design/build.gradle.kts b/design/build.gradle.kts
@@ -1,25 +1,21 @@
 /**
- * Copyright (c) 2023 Ahmed El-Helw and Abdulahi Osoble
+ * Copyright (c) 2024 Ahmed El-Helw and Abdulahi Osoble
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  */
-import org.jetbrains.kotlin.gradle.targets.js.dsl.ExperimentalWasmDsl
+import org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi
+import org.jetbrains.kotlin.gradle.ExperimentalWasmDsl
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 
-/**
- * Copyright (c) 2023 Ahmed El-Helw and Abdulahi Osoble
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- */
 plugins {
     alias(libs.plugins.kotlin.multiplatform)
     alias(libs.plugins.android.library)
     alias(libs.plugins.jetbrain.compose)
     alias(libs.plugins.kotlin.compose)
 }
 
-@OptIn(org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi::class)
+@OptIn(ExperimentalKotlinGradlePluginApi::class)
 kotlin {
     applyDefaultHierarchyTemplate()
 
@@ -30,10 +26,8 @@ kotlin {
     wasmJs { browser() }
 
     androidTarget {
-        compilations.all {
-            kotlinOptions {
-                jvmTarget = "1.8"
-            }
+        compilerOptions {
+            jvmTarget.set(JvmTarget.JVM_1_8)
         }
     }
 
@@ -84,16 +78,15 @@ kotlin {
         val wasmJsMain by getting {
             dependsOn(webMain)
             dependencies {
-                val wasmKtor = "3.0.0-wasm1"
-                implementation("io.ktor:ktor-client-core:$wasmKtor")
+                implementation(libs.ktor.client.core)
             }
         }
     }
 }
 
 android {
     namespace = "dev.helw.playground.sdui.design"
-    compileSdk = 34
+    compileSdk = 35
     defaultConfig.minSdk = 21
     sourceSets {
         named("main") {

diff --git a/design/src/androidMain/kotlin/dev/helw/playground/sdui/design/core/font.kt b/design/src/androidMain/kotlin/dev/helw/playground/sdui/design/core/font.kt
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2023 Ahmed El-Helw and Abdulahi Osoble
+ * Copyright (c) 2024 Ahmed El-Helw and Abdulahi Osoble
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.

diff --git a/design/src/commonMain/kotlin/dev/helw/playground/sdui/design/component/AsyncImage.kt b/design/src/commonMain/kotlin/dev/helw/playground/sdui/design/component/AsyncImage.kt
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2023 Ahmed El-Helw and Abdulahi Osoble
+ * Copyright (c) 2024 Ahmed El-Helw and Abdulahi Osoble
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.

diff --git a/design/src/commonMain/kotlin/dev/helw/playground/sdui/design/component/Icon.kt b/design/src/commonMain/kotlin/dev/helw/playground/sdui/design/component/Icon.kt
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2023 Ahmed El-Helw and Abdulahi Osoble
+ * Copyright (c) 2024 Ahmed El-Helw and Abdulahi Osoble
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.

diff --git a/design/src/commonMain/kotlin/dev/helw/playground/sdui/design/component/Label.kt b/design/src/commonMain/kotlin/dev/helw/playground/sdui/design/component/Label.kt
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2023 Ahmed El-Helw and Abdulahi Osoble
+ * Copyright (c) 2024 Ahmed El-Helw and Abdulahi Osoble
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.

diff --git a/design/src/commonMain/kotlin/dev/helw/playground/sdui/design/component/ProgressStatus.kt b/design/src/commonMain/kotlin/dev/helw/playground/sdui/design/component/ProgressStatus.kt
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2023 Ahmed El-Helw and Abdulahi Osoble
+ * Copyright (c) 2024 Ahmed El-Helw and Abdulahi Osoble
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.

diff --git a/design/src/commonMain/kotlin/dev/helw/playground/sdui/design/component/listitem/ListItem.kt b/design/src/commonMain/kotlin/dev/helw/playground/sdui/design/component/listitem/ListItem.kt
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2023 Ahmed El-Helw and Abdulahi Osoble
+ * Copyright (c) 2024 Ahmed El-Helw and Abdulahi Osoble
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.

diff --git a/...src/commonMain/kotlin/dev/helw/playground/sdui/design/component/listitem/ListItemScope.kt b/...src/commonMain/kotlin/dev/helw/playground/sdui/design/component/listitem/ListItemScope.kt
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2023 Ahmed El-Helw and Abdulahi Osoble
+ * Copyright (c) 2024 Ahmed El-Helw and Abdulahi Osoble
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.