diff --git a/aboutlibraries-compose/build.gradle.kts b/aboutlibraries-compose/build.gradle.kts index 237fb94fa..d8aeac9f2 100644 --- a/aboutlibraries-compose/build.gradle.kts +++ b/aboutlibraries-compose/build.gradle.kts @@ -65,7 +65,7 @@ android { compose { //kotlinCompilerPlugin.set("androidx.compose.compiler:compiler") - kotlinCompilerPluginArgs.add("suppressKotlinVersionCompatibilityCheck=${libs.versions.kotlinCore.get()}") + //kotlinCompilerPluginArgs.add("suppressKotlinVersionCompatibilityCheck=${libs.versions.kotlinCore.get()}") } kotlin { diff --git a/aboutlibraries-core/build.gradle.kts b/aboutlibraries-core/build.gradle.kts index 0634ae0d0..e99a12255 100644 --- a/aboutlibraries-core/build.gradle.kts +++ b/aboutlibraries-core/build.gradle.kts @@ -54,7 +54,9 @@ kotlin { androidTarget { publishAllLibraryVariants() } - // wasm() + wasm { + nodejs() + } // tier 1 linuxX64() @@ -120,6 +122,13 @@ kotlin { dependsOn(commonMain) } + val wasmJsMain by getting { + dependsOn(multiplatformMain) + dependencies { + implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.6.1-wasm1") + } + } + val jvmTest by getting { dependencies { implementation(kotlin("test-junit")) diff --git a/app-desktop/build.gradle.kts b/app-desktop/build.gradle.kts index 06a3cda49..f2bfd5604 100644 --- a/app-desktop/build.gradle.kts +++ b/app-desktop/build.gradle.kts @@ -28,7 +28,7 @@ dependencies { compose { kotlinCompilerPlugin.set(libs.versions.composeCompilerJb.get()) - kotlinCompilerPluginArgs.add("suppressKotlinVersionCompatibilityCheck=${libs.versions.kotlinCore.get()}") + //kotlinCompilerPluginArgs.add("suppressKotlinVersionCompatibilityCheck=${libs.versions.kotlinCore.get()}") } tasks.withType { diff --git a/app-desktop/src/main/resources/aboutlibraries.json b/app-desktop/src/main/resources/aboutlibraries.json index f4f9a11f2..46fb1328d 100644 --- a/app-desktop/src/main/resources/aboutlibraries.json +++ b/app-desktop/src/main/resources/aboutlibraries.json @@ -1,6 +1,6 @@ { "metadata": { - "generated": "2023-09-22T14:16:45.545Z" + "generated": "2023-11-04T07:40:40.575Z" }, "libraries": [ { @@ -13,7 +13,7 @@ "name": "Mike Penz" } ], - "artifactVersion": "10.9.0-b02", + "artifactVersion": "10.9.1", "description": "AboutLibraries automatically detects all dependencies of a project and collects their information including the license. Optionally visualising it via the provided ui components.", "scm": { "connection": "scm:git@github.com:mikepenz/AboutLibraries.git", @@ -36,7 +36,7 @@ "name": "Mike Penz" } ], - "artifactVersion": "10.9.0-b02", + "artifactVersion": "10.9.1", "description": "AboutLibraries automatically detects all dependencies of a project and collects their information including the license. Optionally visualising it via the provided ui components.", "scm": { "connection": "scm:git@github.com:mikepenz/AboutLibraries.git", @@ -60,7 +60,7 @@ "name": "Compose Multiplatform Team" } ], - "artifactVersion": "1.5.1", + "artifactVersion": "1.5.10", "description": "Animation engine and animation primitives that are the building blocks of the Compose animation library", "scm": { "connection": "scm:git:https://github.com/JetBrains/compose-jb.git", @@ -84,7 +84,7 @@ "name": "Compose Multiplatform Team" } ], - "artifactVersion": "1.5.1", + "artifactVersion": "1.5.10", "description": "Compose animation library", "scm": { "connection": "scm:git:https://github.com/JetBrains/compose-jb.git", @@ -108,7 +108,7 @@ "name": "Compose Multiplatform Team" } ], - "artifactVersion": "1.5.1", + "artifactVersion": "1.5.10", "description": "Compose Desktop", "scm": { "connection": "scm:git:https://github.com/JetBrains/compose-jb.git", @@ -132,7 +132,7 @@ "name": "Compose Multiplatform Team" } ], - "artifactVersion": "1.5.1", + "artifactVersion": "1.5.10", "description": "Higher level abstractions of the Compose UI primitives. This library is design system agnostic, providing the high-level building blocks for both application and design-system developers", "scm": { "connection": "scm:git:https://github.com/JetBrains/compose-jb.git", @@ -156,7 +156,7 @@ "name": "Compose Multiplatform Team" } ], - "artifactVersion": "1.5.1", + "artifactVersion": "1.5.10", "description": "Compose layout implementations", "scm": { "connection": "scm:git:https://github.com/JetBrains/compose-jb.git", @@ -180,7 +180,7 @@ "name": "Compose Multiplatform Team" } ], - "artifactVersion": "1.5.1", + "artifactVersion": "1.5.10", "description": "Compose Material Design Components library", "scm": { "connection": "scm:git:https://github.com/JetBrains/compose-jb.git", @@ -204,7 +204,7 @@ "name": "Compose Multiplatform Team" } ], - "artifactVersion": "1.5.1", + "artifactVersion": "1.5.10", "description": "Compose Material Design core icons. This module contains the most commonly used set of Material icons.", "scm": { "connection": "scm:git:https://github.com/JetBrains/compose-jb.git", @@ -228,7 +228,7 @@ "name": "Compose Multiplatform Team" } ], - "artifactVersion": "1.5.1", + "artifactVersion": "1.5.10", "description": "Material ripple used to build interactive components", "scm": { "connection": "scm:git:https://github.com/JetBrains/compose-jb.git", @@ -252,7 +252,7 @@ "name": "Compose Multiplatform Team" } ], - "artifactVersion": "1.5.1", + "artifactVersion": "1.5.10", "description": "Tree composition support for code generated by the Compose compiler plugin and corresponding public API", "scm": { "connection": "scm:git:https://github.com/JetBrains/compose-jb.git", @@ -276,7 +276,7 @@ "name": "Compose Multiplatform Team" } ], - "artifactVersion": "1.5.1", + "artifactVersion": "1.5.10", "description": "Compose components that allow saving and restoring the local ui state", "scm": { "connection": "scm:git:https://github.com/JetBrains/compose-jb.git", @@ -300,7 +300,7 @@ "name": "Compose Multiplatform Team" } ], - "artifactVersion": "1.5.1", + "artifactVersion": "1.5.10", "description": "Compose UI primitives. This library contains the primitives that form the Compose UI Toolkit, such as drawing, measurement and layout.", "scm": { "connection": "scm:git:https://github.com/JetBrains/compose-jb.git", @@ -324,7 +324,7 @@ "name": "Compose Multiplatform Team" } ], - "artifactVersion": "1.5.1", + "artifactVersion": "1.5.10", "description": "Compose classes related to dimensions without units", "scm": { "connection": "scm:git:https://github.com/JetBrains/compose-jb.git", @@ -348,7 +348,7 @@ "name": "Compose Multiplatform Team" } ], - "artifactVersion": "1.5.1", + "artifactVersion": "1.5.10", "description": "Compose graphics", "scm": { "connection": "scm:git:https://github.com/JetBrains/compose-jb.git", @@ -372,7 +372,7 @@ "name": "Compose Multiplatform Team" } ], - "artifactVersion": "1.5.1", + "artifactVersion": "1.5.10", "description": "Compose Text primitives and utilities", "scm": { "connection": "scm:git:https://github.com/JetBrains/compose-jb.git", @@ -396,7 +396,7 @@ "name": "Compose Multiplatform Team" } ], - "artifactVersion": "1.5.1", + "artifactVersion": "1.5.10", "description": "Compose tooling library API. This library provides the API required to declare @Preview composables in user apps.", "scm": { "connection": "scm:git:https://github.com/JetBrains/compose-jb.git", @@ -420,7 +420,7 @@ "name": "Compose Multiplatform Team" } ], - "artifactVersion": "1.5.1", + "artifactVersion": "1.5.10", "description": "Compose classes for simple units", "scm": { "connection": "scm:git:https://github.com/JetBrains/compose-jb.git", @@ -444,7 +444,7 @@ "name": "Compose Multiplatform Team" } ], - "artifactVersion": "1.5.1", + "artifactVersion": "1.5.10", "description": "Internal Compose utilities used by other modules", "scm": { "connection": "scm:git:https://github.com/JetBrains/compose-jb.git", @@ -468,8 +468,8 @@ "name": "Kotlin Team" } ], - "artifactVersion": "1.9.10", - "description": "Kotlin Standard Library for JVM", + "artifactVersion": "1.9.20", + "description": "Kotlin Standard Library", "scm": { "connection": "scm:git:https://github.com/JetBrains/kotlin.git", "url": "https://github.com/JetBrains/kotlin", @@ -481,30 +481,6 @@ "Apache-2.0" ] }, - { - "uniqueId": "org.jetbrains.kotlin:kotlin-stdlib-common", - "funding": [ - - ], - "developers": [ - { - "organisationUrl": "https://www.jetbrains.com", - "name": "Kotlin Team" - } - ], - "artifactVersion": "1.9.10", - "description": "Kotlin Common Standard Library", - "scm": { - "connection": "scm:git:https://github.com/JetBrains/kotlin.git", - "url": "https://github.com/JetBrains/kotlin", - "developerConnection": "scm:git:https://github.com/JetBrains/kotlin.git" - }, - "name": "Kotlin Stdlib Common", - "website": "https://kotlinlang.org/", - "licenses": [ - "Apache-2.0" - ] - }, { "uniqueId": "org.jetbrains.kotlin:kotlin-stdlib-jdk7", "funding": [ @@ -516,7 +492,7 @@ "name": "Kotlin Team" } ], - "artifactVersion": "1.9.10", + "artifactVersion": "1.8.20", "description": "Kotlin Standard Library JDK 7 extension", "scm": { "connection": "scm:git:https://github.com/JetBrains/kotlin.git", @@ -540,7 +516,7 @@ "name": "Kotlin Team" } ], - "artifactVersion": "1.9.10", + "artifactVersion": "1.8.20", "description": "Kotlin Standard Library JDK 8 extension", "scm": { "connection": "scm:git:https://github.com/JetBrains/kotlin.git", @@ -586,7 +562,7 @@ "name": "JetBrains Team" } ], - "artifactVersion": "0.3.5", + "artifactVersion": "0.3.6", "description": "Kotlin Immutable Collections multiplatform library", "scm": { "url": "https://github.com/Kotlin/kotlinx.collections.immutable" @@ -718,7 +694,7 @@ "name": "Compose Multiplatform Team" } ], - "artifactVersion": "0.7.77", + "artifactVersion": "0.7.85", "description": "Kotlin Skia bindings", "scm": { "connection": "scm:git:https://www.github.com/JetBrains/skiko.git", @@ -742,7 +718,7 @@ "name": "Compose Multiplatform Team" } ], - "artifactVersion": "0.7.77", + "artifactVersion": "0.7.85", "description": "Kotlin Skia bindings", "scm": { "connection": "scm:git:https://www.github.com/JetBrains/skiko.git", diff --git a/build.gradle b/build.gradle index 6c3fab024..78534b1ad 100644 --- a/build.gradle +++ b/build.gradle @@ -21,10 +21,6 @@ buildscript { } } - -import com.vanniktech.maven.publish.AndroidSingleVariantLibrary -import com.vanniktech.maven.publish.SonatypeHost - allprojects { group = GROUP version = VERSION_NAME @@ -33,14 +29,10 @@ allprojects { mavenLocal() mavenCentral() google() - maven { - // (mp) remove when available on maven center - url "https://maven.pkg.jetbrains.space/public/p/kotlinx-html/maven" - content { includeGroup "org.jetbrains.kotlinx" } - } - maven { - setUrl("https://maven.pkg.jetbrains.space/public/p/compose/dev") - } + maven { setUrl("https://androidx.dev/storage/compose-compiler/repository") } + // maven { setUrl("https://maven.pkg.jetbrains.space/public/p/compose/dev") } + maven { setUrl("https://maven.pkg.jetbrains.space/kotlin/p/wasm/experimental") } + // maven { setUrl("https://maven.pkg.jetbrains.space/kotlin/p/kotlin/dev") } } } diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 5df07bcf7..8505119d8 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -5,30 +5,30 @@ coreMinSdk = "19" minSdk = "21" targetSdk = "34" # build -gradleBuild = "8.1.1" +gradleBuild = "8.1.2" buildTools = "34.0.0" # kotlin -dokka = "1.9.0" -kotlinCore = { require = "1.9.10" } +dokka = "1.9.10" +kotlinCore = { require = "1.9.20" } kotlinCoroutines = { require = "1.7.3" } kotlinxSerialization = "1.6.0" -kotlinxCollections = "0.3.5" +kotlinxCollections = "0.3.6" # compose -compose = "1.5.1" -composeUi = "1.5.1" # foundation / material -composeCompiler = "1.5.3" -composejb = "1.5.1" # "1.4.0-dev-wasm09" -composeCompilerJb = "1.5.0" +compose = "1.5.4" +composeUi = "1.5.4" # foundation / material +composeCompiler = "1.5.4-dev-k1.9.20-50f08dfa4b4" +composejb = "1.5.10" # "1.4.0-dev-wasm09" +composeCompilerJb = "1.5.3" # androidx -activity = "1.7.2" +activity = "1.8.0" cardview = "1.0.0" constraintLayout = "2.1.4" core = "1.12.0" lifecycle = { require = "2.6.2" } -navigation = "2.7.3" -recyclerView = "1.3.1" +navigation = "2.7.5" +recyclerView = "1.3.2" # google -material = "1.9.0" +material = "1.10.0" # other accompanist = "0.32.0" fastAdapter = "5.7.0" @@ -37,7 +37,7 @@ iconics = "5.4.0" itemAnimators = "1.1.0" ivy = "2.5.1" materialDrawer = "9.0.2" -okhttp = "4.11.0" +okhttp = "4.12.0" [libraries] # build