Skip to content
Merged
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
684 changes: 390 additions & 294 deletions .kotlin-js-store/yarn.lock → .kotlin-js-store/js/yarn.lock

Large diffs are not rendered by default.

2,161 changes: 2,161 additions & 0 deletions .kotlin-js-store/wasm/yarn.lock

Large diffs are not rendered by default.

5 changes: 0 additions & 5 deletions build-logic/src/main/kotlin/-KmpConfigurationExtension.kt
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@
import io.matthewnelson.kmp.configuration.extension.KmpConfigurationExtension
import io.matthewnelson.kmp.configuration.extension.container.target.KmpConfigurationContainerDsl
import org.gradle.api.Action
import org.gradle.api.JavaVersion
import org.jetbrains.kotlin.gradle.ExperimentalWasmDsl

fun KmpConfigurationExtension.configureShared(
Expand All @@ -34,10 +33,6 @@ fun KmpConfigurationExtension.configureShared(
}

jvm {
kotlinJvmTarget = JavaVersion.VERSION_1_8
compileSourceCompatibility = JavaVersion.VERSION_1_8
compileTargetCompatibility = JavaVersion.VERSION_1_8

java9ModuleInfoName = java9ModuleName
}

Expand Down
15 changes: 12 additions & 3 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@
import org.jetbrains.kotlin.gradle.targets.js.yarn.YarnLockMismatchReport
import org.jetbrains.kotlin.gradle.targets.js.yarn.YarnPlugin
import org.jetbrains.kotlin.gradle.targets.js.yarn.YarnRootExtension
import org.jetbrains.kotlin.gradle.targets.wasm.yarn.WasmYarnPlugin
import org.jetbrains.kotlin.gradle.targets.wasm.yarn.WasmYarnRootExtension

plugins {
alias(libs.plugins.benchmark) apply(false)
Expand All @@ -36,9 +38,16 @@ allprojects {
val CHECK_PUBLICATION = findProperty("CHECK_PUBLICATION") != null

plugins.withType<YarnPlugin> {
the<YarnRootExtension>().lockFileDirectory = rootDir.resolve(".kotlin-js-store")
if (CHECK_PUBLICATION) {
the<YarnRootExtension>().yarnLockMismatchReport = YarnLockMismatchReport.NONE
the<YarnRootExtension>().apply {
lockFileDirectory = rootDir.resolve(".kotlin-js-store").resolve("js")
if (CHECK_PUBLICATION) yarnLockMismatchReport = YarnLockMismatchReport.NONE
}
}

plugins.withType<WasmYarnPlugin> {
the<WasmYarnRootExtension>().apply {
lockFileDirectory = rootDir.resolve(".kotlin-js-store").resolve("wasm")
if (CHECK_PUBLICATION) yarnLockMismatchReport = YarnLockMismatchReport.NONE
}
}

Expand Down
3 changes: 2 additions & 1 deletion gh-pages/publish.sh
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,8 @@ cd ..
cp -aR build/dokka/html/* gh-pages/$REPO_NAME

cd "$DIR_SCRIPT/$REPO_NAME"
sed -i "s|module:|module:library/|g" "package-list"
PACKAGE_LIST="$(sed "s|module:|module:library/|g" "package-list")"
echo "$PACKAGE_LIST" > package-list

git add --all
git commit -S --message "Update dokka docs"
Expand Down
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ kotlin.native.ignoreDisabledTargets=true
org.jetbrains.dokka.experimental.gradle.pluginMode=V2Enabled
org.jetbrains.dokka.experimental.gradle.pluginMode.noWarn=true

SONATYPE_HOST=S01
SONATYPE_HOST=CENTRAL_PORTAL
RELEASE_SIGNING_ENABLED=true

GROUP=org.kotlincrypto.bitops
Expand Down
10 changes: 5 additions & 5 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
[versions]
gradle-benchmark = "0.4.13"
gradle-binary-compat = "0.17.0"
gradle-benchmark = "0.4.14"
gradle-binary-compat = "0.18.1"
gradle-dokka = "2.0.0"
gradle-kmp-configuration = "0.4.0"
gradle-kotlin = "2.1.10"
gradle-publish-maven = "0.30.0"
gradle-kmp-configuration = "0.5.1"
gradle-kotlin = "2.2.10"
gradle-publish-maven = "0.34.0"

[libraries]
benchmark-runtime = { module = "org.jetbrains.kotlinx:kotlinx-benchmark-runtime", version.ref = "gradle-benchmark" }
Expand Down
4 changes: 2 additions & 2 deletions gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,5 @@ zipStorePath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME

# https://gradle.org/release-checksums/
distributionSha256Sum=296742a352f0b20ec14b143fb684965ad66086c7810b7b255dee216670716175
distributionUrl=https\://services.gradle.org/distributions/gradle-8.12.1-all.zip
distributionSha256Sum=ed1a8d686605fd7c23bdf62c7fc7add1c5b23b2bbc3721e661934ef4a4911d7c
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-all.zip
20 changes: 12 additions & 8 deletions tools/check-publication/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -13,22 +13,26 @@
* See the License for the specific language governing permissions and
* limitations under the License.
**/
import kotlin.io.encoding.Base64
import kotlin.io.encoding.ExperimentalEncodingApi

plugins {
id("configuration")
}

repositories {
val host = "https://s01.oss.sonatype.org"

if (version.toString().endsWith("-SNAPSHOT")) {
maven("$host/content/repositories/snapshots/")
maven("https://central.sonatype.com/repository/maven-snapshots/")
} else {
maven("$host/content/groups/staging") {
maven("https://central.sonatype.com/api/v1/publisher/deployments/download/") {
val p = rootProject.properties

credentials {
username = p["mavenCentralUsername"]?.toString()
password = p["mavenCentralPassword"]?.toString()
authentication.create("Authorization", HttpHeaderAuthentication::class.java)
credentials(HttpHeaderCredentials::class.java) {
val username = p["mavenCentralUsername"]?.toString() ?: throw NullPointerException()
val password = p["mavenCentralPassword"]?.toString() ?: throw NullPointerException()
name = "Authorization"
@OptIn(ExperimentalEncodingApi::class)
value = "Bearer " + Base64.Mime.encode("$username:$password".encodeToByteArray())
}
}
}
Expand Down
Loading