From 7021c673545af343c7ec6b22f6747ea5dd2775f5 Mon Sep 17 00:00:00 2001 From: Ahmed El-Helw Date: Thu, 28 Nov 2024 03:34:48 +0400 Subject: [PATCH] Update dependencies and copyright year --- LICENSE | 2 +- build-logic/convention/build.gradle.kts | 2 +- .../kotlin/convention.spotless.gradle.kts | 2 +- .../gradle/wrapper/gradle-wrapper.properties | 4 +- build-logic/settings.gradle.kts | 2 +- build.gradle.kts | 2 +- catalog/build.gradle.kts | 32 +- catalog/src/androidMain/AndroidManifest.xml | 2 +- .../dev/helw/playground/sdui/MainActivity.kt | 2 +- .../sdui/network/SduiClient.android.kt | 2 +- catalog/src/androidMain/res/values/styles.xml | 2 +- .../dev/helw/playground/sdui/ColorScene.kt | 2 +- .../helw/playground/sdui/CompositionLocals.kt | 2 +- .../helw/playground/sdui/FullScreenDemo.kt | 2 +- .../dev/helw/playground/sdui/IconScene.kt | 2 +- .../dev/helw/playground/sdui/MainDemo.kt | 2 +- .../helw/playground/sdui/NativeListScene.kt | 2 +- .../dev/helw/playground/sdui/Navigation.kt | 2 +- .../playground/sdui/ProgressStatusScene.kt | 2 +- .../dev/helw/playground/sdui/SandboxScene.kt | 2 +- .../playground/sdui/ServerDrivenUiScene.kt | 2 +- .../dev/helw/playground/sdui/SizeScene.kt | 2 +- .../helw/playground/sdui/TypographyScene.kt | 2 +- .../playground/sdui/network/SduiClient.kt | 2 +- .../helw/playground/sdui/DesktopDemoApp.kt | 2 +- .../sdui/network/SduiClient.desktop.kt | 2 +- .../kotlin/dev/helw/playground/sdui/Main.kt | 2 +- .../playground/sdui/network/SduiClient.js.kt | 2 +- .../kotlin/dev/helw/playground/sdui/Main.kt | 2 +- .../sdui/network/SduiClient.wasmJs.kt | 2 +- design/build.gradle.kts | 25 +- .../helw/playground/sdui/design/core/font.kt | 2 +- .../sdui/design/component/AsyncImage.kt | 2 +- .../playground/sdui/design/component/Icon.kt | 2 +- .../playground/sdui/design/component/Label.kt | 2 +- .../sdui/design/component/ProgressStatus.kt | 2 +- .../design/component/listitem/ListItem.kt | 2 +- .../component/listitem/ListItemScope.kt | 2 +- .../playground/sdui/design/core/ColorToken.kt | 2 +- .../playground/sdui/design/core/IconToken.kt | 2 +- .../playground/sdui/design/core/SizeToken.kt | 2 +- .../sdui/design/core/TypographyToken.kt | 2 +- .../design/core/color/BackgroundColors.kt | 2 +- .../sdui/design/core/color/ColorBrand.kt | 2 +- .../sdui/design/core/color/MaterialColors.kt | 2 +- .../sdui/design/core/color/TextColors.kt | 2 +- .../playground/sdui/design/theme/Color.kt | 2 +- .../playground/sdui/design/theme/Theme.kt | 2 +- .../helw/playground/sdui/design/core/font.kt | 2 +- .../playground/sdui/design/core/font.js.kt | 2 +- gradle/libs.versions.toml | 25 +- gradle/wrapper/gradle-wrapper.jar | Bin 59203 -> 43583 bytes gradle/wrapper/gradle-wrapper.properties | 5 +- gradlew | 285 ++++--- gradlew.bat | 37 +- kotlin-js-store/yarn.lock | 703 ++++++------------ sdui/build.gradle.kts | 20 +- .../helw/playground/sdui/ServerDrivenUi.kt | 2 +- .../dev/helw/playground/sdui/action/Action.kt | 2 +- .../playground/sdui/action/ActionHandler.kt | 2 +- .../sdui/component/AsyncImageComponent.kt | 2 +- .../sdui/component/IconComponent.kt | 2 +- .../sdui/component/LabelComponent.kt | 2 +- .../sdui/component/ListComponent.kt | 2 +- .../sdui/component/ListItemComponent.kt | 2 +- .../sdui/component/ProgressStatusComponent.kt | 2 +- .../sdui/component/core/ColumnComponent.kt | 2 +- .../sdui/component/core/RowComponent.kt | 2 +- .../list/ListItemContentDescription.kt | 2 +- .../component/list/ListItemContentTitle.kt | 2 +- .../sdui/component/list/ListItemLeading.kt | 2 +- .../sdui/component/list/ListItemTrailing.kt | 2 +- .../sandbox/ChallengeTrackerComponent.kt | 2 +- .../helw/playground/sdui/model/Component.kt | 2 +- .../playground/sdui/model/SduiModifier.kt | 2 +- .../sdui/model/ServerDrivenUiResponse.kt | 2 +- .../sdui/parser/ServerDrivenUiSerializer.kt | 2 +- .../sdui/serializer/IconTokenSerializer.kt | 2 +- .../sdui/serializer/SizeTokenSerializer.kt | 2 +- .../serializer/TypographyTokenSerializer.kt | 2 +- .../serializer/model/BackgroundColorToken.kt | 2 +- .../sdui/serializer/model/ShapeToken.kt | 2 +- .../sdui/serializer/model/TextColorToken.kt | 2 +- settings.gradle.kts | 2 +- spotless/copyright.kt | 2 +- spotless/copyright.kts | 2 +- spotless/copyright.xml | 2 +- 87 files changed, 538 insertions(+), 752 deletions(-) diff --git a/LICENSE b/LICENSE index 9c3e30b..700844a 100644 --- 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 index af78e3b..0ec448d 100644 --- 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 index 1a9ef86..e065302 100644 --- 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 index a8382d7..81aa1c0 100644 --- 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 \ No newline at end of file +zipStorePath=wrapper/dists diff --git a/build-logic/settings.gradle.kts b/build-logic/settings.gradle.kts index 67ac848..70b7029 100644 --- 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 index b046dd4..57214e8 100644 --- 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 index e0f19b2..7c26b63 100644 --- 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 {} } \ No newline at end of file diff --git a/catalog/src/androidMain/AndroidManifest.xml b/catalog/src/androidMain/AndroidManifest.xml index aefde4c..60a0c43 100644 --- a/catalog/src/androidMain/AndroidManifest.xml +++ b/catalog/src/androidMain/AndroidManifest.xml @@ -1,6 +1,6 @@