Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
9 changes: 0 additions & 9 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -56,15 +56,6 @@ kotlin {
}
```

This project depends on [Kobweb](https://github.com/varabyte/kobweb) which is not published to Maven Central yet, so you have to add the following Maven repository:

```kotlin
repositories {
mavenCentral()
maven("https://us-central1-maven.pkg.dev/varabyte-repos/public")
}
```

### Material Symbols & Icons

The Material 3 module uses [Material Symbols & Icons](https://fonts.google.com/icons), but doesn't depend on the stylesheet directly. For Material Icons to work properly, you may need to configure your project following the quick instructions below or [the developer guide](https://developers.google.com/fonts/docs/material_symbols).
Expand Down
2 changes: 1 addition & 1 deletion build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ tasks.wrapper {

plugins {
id("org.jetbrains.dokka")
id("org.jetbrains.kotlinx.binary-compatibility-validator") version "0.16.3"
id("org.jetbrains.kotlinx.binary-compatibility-validator") version "0.18.1"
}

dependencies {
Expand Down
12 changes: 6 additions & 6 deletions buildSrc/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -2,19 +2,19 @@ plugins {
`kotlin-dsl`
}
repositories {
//mavenLocal() // comment out when not needed
mavenLocal() // TODO comment out when not needed
gradlePluginPortal()
//maven("https://maven.pkg.jetbrains.space/public/p/compose/dev")
}

dependencies {
val kotlinVersion = "2.1.0"
val kotlinVersion = "2.2.21"
implementation(kotlin("gradle-plugin", kotlinVersion))
implementation("org.jetbrains.kotlin:compose-compiler-gradle-plugin:$kotlinVersion")
implementation("org.jetbrains.compose:compose-gradle-plugin:1.7.1")
val huanshankejiGradlePluginsVersion = "0.9.0" // don't use a snapshot version in a main branch
implementation("org.jetbrains.compose:compose-gradle-plugin:1.9.1")
val huanshankejiGradlePluginsVersion = "0.10.0-SNAPSHOT" // TODO don't use a snapshot version in a main branch
implementation("com.huanshankeji:kotlin-common-gradle-plugins:$huanshankejiGradlePluginsVersion")
implementation("com.huanshankeji.team:gradle-plugins:$huanshankejiGradlePluginsVersion")
implementation("com.huanshankeji:common-gradle-dependencies:0.9.0-20241203") // don't use a snapshot version in a main branch
implementation("org.jetbrains.dokka:dokka-gradle-plugin:2.0.0-Beta")
implementation("com.huanshankeji:common-gradle-dependencies:0.10.0-20251024-SNAPSHOT") // don't use a snapshot version in a main branch
implementation("org.jetbrains.dokka:dokka-gradle-plugin:2.1.0")
}
6 changes: 4 additions & 2 deletions buildSrc/src/main/kotlin/VersionsAndDependencies.kt
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,10 @@ import com.huanshankeji.CommonDependencies
const val projectVersion = "0.4.1-SNAPSHOT"

object DependencyVersions {
val kobweb = "0.20.0"
val materialWeb = "2.2.0"
// https://github.com/varabyte/kobweb/releases
val kobweb = "0.23.3"
// https://github.com/material-components/material-web/releases
val materialWeb = "2.4.0"


// legacy versions that don't need to be updated
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ plugins {

repositories {
mavenCentral()
google()
maven("https://maven.pkg.jetbrains.space/public/p/compose/dev")
maven("https://us-central1-maven.pkg.dev/varabyte-repos/public") // for Kobweb
}

group = "com.huanshankeji"
Expand Down
4 changes: 2 additions & 2 deletions compose-html-common/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import com.huanshankeji.team.`Shreck Ye`
import com.huanshankeji.team.ShreckYe
import com.huanshankeji.team.pomForTeamDefaultOpenSource

plugins {
Expand All @@ -24,6 +24,6 @@ publishing.publications.withType<MavenPublication> {
"Huanshankeji Compose HTML common",
"Huanshankeji's common code for Compose HTML"
) {
`Shreck Ye`()
ShreckYe()
}
}
4 changes: 2 additions & 2 deletions compose-html-material-legacy/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import com.huanshankeji.team.`Shreck Ye`
import com.huanshankeji.team.ShreckYe
import com.huanshankeji.team.pomForTeamDefaultOpenSource

plugins {
Expand Down Expand Up @@ -46,6 +46,6 @@ publishing.publications.withType<MavenPublication> {
"Compose HTML Material 2",
"Legacy Material 2 components for Compose HTML"
) {
`Shreck Ye`()
ShreckYe()
}
}
4 changes: 2 additions & 2 deletions compose-html-material3/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import com.huanshankeji.team.`Shreck Ye`
import com.huanshankeji.team.ShreckYe
import com.huanshankeji.team.pomForTeamDefaultOpenSource

plugins {
Expand All @@ -25,6 +25,6 @@ publishing.publications.withType<MavenPublication> {
"Compose HTML Material 3",
"Material 3 components for Compose HTML"
) {
`Shreck Ye`()
ShreckYe()
}
}
3 changes: 1 addition & 2 deletions gradle.properties
Original file line number Diff line number Diff line change
@@ -1,2 +1 @@
# for Dokka
org.jetbrains.dokka.experimental.gradle.pluginMode=V2Enabled
org.gradle.configuration-cache=true
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
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-9.0.0-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-9.1.0-all.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Expand Down
3 changes: 0 additions & 3 deletions gradlew
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,6 @@ case "$( uname )" in #(
NONSTOP* ) nonstop=true ;;
esac

CLASSPATH="\\\"\\\""


# Determine the Java command to use to start the JVM.
Expand Down Expand Up @@ -172,7 +171,6 @@ fi
# For Cygwin or MSYS, switch paths to Windows format before running java
if "$cygwin" || "$msys" ; then
APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )

JAVACMD=$( cygpath --unix "$JAVACMD" )

Expand Down Expand Up @@ -212,7 +210,6 @@ DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'

set -- \
"-Dorg.gradle.appname=$APP_BASE_NAME" \
-classpath "$CLASSPATH" \
-jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \
"$@"

Expand Down
3 changes: 1 addition & 2 deletions gradlew.bat
Original file line number Diff line number Diff line change
Expand Up @@ -70,11 +70,10 @@ goto fail
:execute
@rem Setup the command line

set CLASSPATH=


@rem Execute Gradle
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %*
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %*

:end
@rem End local scope for the variables with windows NT shell
Expand Down
Loading
Loading