Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Compose 1.5.4 (mp 1.5.10) | wasm target for core module | Kotlin 1.9.20 #932

Merged
merged 2 commits into from
Nov 4, 2023
Merged

Compose 1.5.4 (mp 1.5.10) | wasm target for core module | Kotlin 1.9.20 #932

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6683388
- upgrade to gradle 8.4
mikepenz Nov 4, 2023
e680a50
- upgrade to kotlin 1.9.20
mikepenz Nov 4, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion aboutlibraries-compose/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
11 changes: 10 additions & 1 deletion aboutlibraries-core/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,9 @@ kotlin {
androidTarget {
publishAllLibraryVariants()
}
// wasm()
wasm {
nodejs()
}

// tier 1
linuxX64()
Expand Down Expand Up @@ -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")
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ Use version catalog instead (org.jetbrains.kotlinx:kotlinx-serialization-json is already available as kotlinx-serialization, but using version 1.6.0 instead)

}
}

val jvmTest by getting {
dependencies {
implementation(kotlin("test-junit"))
Expand Down
2 changes: 1 addition & 1 deletion app-desktop/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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<JavaCompile> {
Expand Down
78 changes: 27 additions & 51 deletions app-desktop/src/main/resources/aboutlibraries.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"metadata": {
"generated": "2023-09-22T14:16:45.545Z"
"generated": "2023-11-04T07:40:40.575Z"
},
"libraries": [
{
Expand All @@ -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",
Expand All @@ -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",
Expand All @@ -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",
Expand All @@ -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",
Expand All @@ -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",
Expand All @@ -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",
Expand All @@ -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",
Expand All @@ -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",
Expand All @@ -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",
Expand All @@ -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",
Expand All @@ -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",
Expand All @@ -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",
Expand All @@ -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",
Expand All @@ -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",
Expand All @@ -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",
Expand All @@ -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",
Expand All @@ -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",
Expand All @@ -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",
Expand All @@ -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",
Expand All @@ -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",
Expand All @@ -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": [
Expand All @@ -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",
Expand All @@ -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",
Expand Down Expand Up @@ -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"
Expand Down Expand Up @@ -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",
Expand All @@ -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",
Expand Down
16 changes: 4 additions & 12 deletions build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,6 @@ buildscript {
}
}


import com.vanniktech.maven.publish.AndroidSingleVariantLibrary
import com.vanniktech.maven.publish.SonatypeHost

allprojects {
group = GROUP
version = VERSION_NAME
Expand All @@ -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") }
}
}

Expand Down
28 changes: 14 additions & 14 deletions gradle/libs.versions.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-all.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Expand Down
Loading
Loading