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
4 changes: 4 additions & 0 deletions .github/workflows/CD.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,10 @@ jobs:
build:
runs-on: ubuntu-latest

permissions:
contents: read
id-token: write

environment:
name: MavenCentral

Expand Down
4 changes: 3 additions & 1 deletion .github/workflows/dependencies.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,9 @@ jobs:
- uses: gradle/actions/dependency-submission@v5

dependency-review:
runs-on: ubuntu-latest
runs-on: ubuntu-slim
permissions: {}

needs: dependency-submission
if: github.event_name == 'pull_request'
steps:
Expand Down
2 changes: 2 additions & 0 deletions gradle/build-logic/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@ dependencies {
implementation(libs.plugins.licensee.toDep())
implementation(libs.plugins.detekt.toDep())
implementation(libs.plugins.mavencentral.toDep())
implementation(libs.plugins.sigstore.toDep())
implementation(libs.plugins.foojay.toDep())
implementation(libs.serialization.xml) {
exclude("io.github.pdvrieze.xmlutil", "core")
}
Expand Down
1 change: 1 addition & 0 deletions gradle/build-logic/settings.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ dependencyResolutionManagement {
repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS)
repositories {
mavenCentral()
gradlePluginPortal()
}
versionCatalogs.register("libs") {
from(files("../libs.versions.toml"))
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
plugins {
id("org.gradle.toolchains.foojay-resolver-convention")
}

dependencyResolutionManagement {
repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS)
repositories {
Expand Down
14 changes: 7 additions & 7 deletions gradle/build-logic/src/main/kotlin/publishedLibrary.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
import org.gradle.api.publish.maven.*
import org.gradle.kotlin.dsl.*
import java.util.*

plugins {
id("setup")
id("maven-publish")
id("signing")
id("io.github.hfhbd.mavencentral")
id("dev.sigstore.sign")
}

kotlin {
Expand Down Expand Up @@ -55,11 +54,12 @@ publishing {
}

signing {
val signingKey = providers.gradleProperty("SIGNING_PRIVATE_KEY")
if (signingKey.isPresent) {
useInMemoryPgpKeys(signingKey.get(), providers.gradleProperty("SIGNING_PASSWORD").get())
sign(publishing.publications)
}
useInMemoryPgpKeys(
project.providers.gradleProperty("signingKey").orNull,
project.providers.gradleProperty("signingPassword").orNull,
)
isRequired = project.providers.gradleProperty("signingKey").isPresent
sign(publishing.publications)
}

// https://youtrack.jetbrains.com/issue/KT-46466
Expand Down
8 changes: 1 addition & 7 deletions gradle/build-logic/src/main/kotlin/setup.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,8 @@ plugins {

kotlin {
js {
browser()
useEsModules()
browser {
commonWebpackConfig {
scssSupport {
enabled.set(true)
}
}
}
compilerOptions {
target.set("es2015")
}
Expand Down
6 changes: 4 additions & 2 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[versions]
kotlin = "2.2.21"
compose = "1.9.0"
kotlin = "2.3.0"
compose = "1.9.3"
coroutines = "1.10.2"
xml = "0.91.3"

Expand All @@ -23,3 +23,5 @@ kotlin-plugin-compose = { id = "org.jetbrains.kotlin.plugin.compose", version.re
licensee = { id = "app.cash.licensee", version = "1.14.1" }
detekt = { id = "io.gitlab.arturbosch.detekt", version = "1.23.8" }
mavencentral = { id = "io.github.hfhbd.mavencentral", version = "0.0.23" }
foojay = { id = "org.gradle.toolchains.foojay-resolver-convention", version = "1.0.0" }
sigstore = { id = "dev.sigstore.sign", version = "2.0.0" }
4 changes: 2 additions & 2 deletions gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionSha256Sum=2fdde961d051e8fc4c9918aa40d3eee24fd9f1d32f705f517af9c89d758af3be
distributionUrl=https\://services.gradle.org/distributions/gradle-9.2.0-rc-1-bin.zip
distributionSha256Sum=72f44c9f8ebcb1af43838f45ee5c4aa9c5444898b3468ab3f4af7b6076c5bc3f
distributionUrl=https\://services.gradle.org/distributions/gradle-9.2.1-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Expand Down
82 changes: 42 additions & 40 deletions kotlin-js-store/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion settings.gradle.dcl
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ pluginManagement {

plugins {
id("MyRepos")
id("org.gradle.toolchains.foojay-resolver-convention").version("1.0.0")
}

enableFeaturePreview("STABLE_CONFIGURATION_CACHE")
Expand Down
7 changes: 4 additions & 3 deletions showcase/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,10 @@ kotlin {
js {
browser {
binaries.executable()
useEsModules()
compilerOptions {
target.set("es2015")
commonWebpackConfig {
scssSupport {
enabled.set(true)
}
}
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -404,7 +404,7 @@ private fun CustomFileInputView() {
attrs = { classes("btn-outline-secondary") }
) {
upload!!.value = ""
upload!!.click()
upload.click()
}
}
}
Expand Down
Loading