Skip to content

Commit 82656cb

Browse files
authored
Update dependencies (#17)
* Update gradle wrapper: 8.12.1 -> 8.14.3 * Update gradle-maven-publish: 0.30.0 -> 0.34.0 * Update gradle-binary-compatibility-validator: 0.17.0 -> 0.18.1 * Update gradle-kmp-configuration: 0.4.0 -> 0.5.1 * Update kotlin: 2.1.10 -> 2.2.10 * Update kotlinx-benchmark: 0.4.13 -> 0.4.14
1 parent f416a75 commit 82656cb

9 files changed

Lines changed: 2585 additions & 319 deletions

File tree

Lines changed: 390 additions & 294 deletions
Large diffs are not rendered by default.

.kotlin-js-store/wasm/yarn.lock

Lines changed: 2161 additions & 0 deletions
Large diffs are not rendered by default.

build-logic/src/main/kotlin/-KmpConfigurationExtension.kt

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
import io.matthewnelson.kmp.configuration.extension.KmpConfigurationExtension
1717
import io.matthewnelson.kmp.configuration.extension.container.target.KmpConfigurationContainerDsl
1818
import org.gradle.api.Action
19-
import org.gradle.api.JavaVersion
2019
import org.jetbrains.kotlin.gradle.ExperimentalWasmDsl
2120

2221
fun KmpConfigurationExtension.configureShared(
@@ -34,10 +33,6 @@ fun KmpConfigurationExtension.configureShared(
3433
}
3534

3635
jvm {
37-
kotlinJvmTarget = JavaVersion.VERSION_1_8
38-
compileSourceCompatibility = JavaVersion.VERSION_1_8
39-
compileTargetCompatibility = JavaVersion.VERSION_1_8
40-
4136
java9ModuleInfoName = java9ModuleName
4237
}
4338

build.gradle.kts

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@
1616
import org.jetbrains.kotlin.gradle.targets.js.yarn.YarnLockMismatchReport
1717
import org.jetbrains.kotlin.gradle.targets.js.yarn.YarnPlugin
1818
import org.jetbrains.kotlin.gradle.targets.js.yarn.YarnRootExtension
19+
import org.jetbrains.kotlin.gradle.targets.wasm.yarn.WasmYarnPlugin
20+
import org.jetbrains.kotlin.gradle.targets.wasm.yarn.WasmYarnRootExtension
1921

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

3840
plugins.withType<YarnPlugin> {
39-
the<YarnRootExtension>().lockFileDirectory = rootDir.resolve(".kotlin-js-store")
40-
if (CHECK_PUBLICATION) {
41-
the<YarnRootExtension>().yarnLockMismatchReport = YarnLockMismatchReport.NONE
41+
the<YarnRootExtension>().apply {
42+
lockFileDirectory = rootDir.resolve(".kotlin-js-store").resolve("js")
43+
if (CHECK_PUBLICATION) yarnLockMismatchReport = YarnLockMismatchReport.NONE
44+
}
45+
}
46+
47+
plugins.withType<WasmYarnPlugin> {
48+
the<WasmYarnRootExtension>().apply {
49+
lockFileDirectory = rootDir.resolve(".kotlin-js-store").resolve("wasm")
50+
if (CHECK_PUBLICATION) yarnLockMismatchReport = YarnLockMismatchReport.NONE
4251
}
4352
}
4453

gh-pages/publish.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,8 @@ cd ..
3030
cp -aR build/dokka/html/* gh-pages/$REPO_NAME
3131

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

3536
git add --all
3637
git commit -S --message "Update dokka docs"

gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ kotlin.native.ignoreDisabledTargets=true
1010
org.jetbrains.dokka.experimental.gradle.pluginMode=V2Enabled
1111
org.jetbrains.dokka.experimental.gradle.pluginMode.noWarn=true
1212

13-
SONATYPE_HOST=S01
13+
SONATYPE_HOST=CENTRAL_PORTAL
1414
RELEASE_SIGNING_ENABLED=true
1515

1616
GROUP=org.kotlincrypto.bitops

gradle/libs.versions.toml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
[versions]
2-
gradle-benchmark = "0.4.13"
3-
gradle-binary-compat = "0.17.0"
2+
gradle-benchmark = "0.4.14"
3+
gradle-binary-compat = "0.18.1"
44
gradle-dokka = "2.0.0"
5-
gradle-kmp-configuration = "0.4.0"
6-
gradle-kotlin = "2.1.10"
7-
gradle-publish-maven = "0.30.0"
5+
gradle-kmp-configuration = "0.5.1"
6+
gradle-kotlin = "2.2.10"
7+
gradle-publish-maven = "0.34.0"
88

99
[libraries]
1010
benchmark-runtime = { module = "org.jetbrains.kotlinx:kotlinx-benchmark-runtime", version.ref = "gradle-benchmark" }

gradle/wrapper/gradle-wrapper.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,5 @@ zipStorePath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55

66
# https://gradle.org/release-checksums/
7-
distributionSha256Sum=296742a352f0b20ec14b143fb684965ad66086c7810b7b255dee216670716175
8-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.12.1-all.zip
7+
distributionSha256Sum=ed1a8d686605fd7c23bdf62c7fc7add1c5b23b2bbc3721e661934ef4a4911d7c
8+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-all.zip

tools/check-publication/build.gradle.kts

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -13,22 +13,26 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
**/
16+
import kotlin.io.encoding.Base64
17+
import kotlin.io.encoding.ExperimentalEncodingApi
18+
1619
plugins {
1720
id("configuration")
1821
}
1922

2023
repositories {
21-
val host = "https://s01.oss.sonatype.org"
22-
2324
if (version.toString().endsWith("-SNAPSHOT")) {
24-
maven("$host/content/repositories/snapshots/")
25+
maven("https://central.sonatype.com/repository/maven-snapshots/")
2526
} else {
26-
maven("$host/content/groups/staging") {
27+
maven("https://central.sonatype.com/api/v1/publisher/deployments/download/") {
2728
val p = rootProject.properties
28-
29-
credentials {
30-
username = p["mavenCentralUsername"]?.toString()
31-
password = p["mavenCentralPassword"]?.toString()
29+
authentication.create("Authorization", HttpHeaderAuthentication::class.java)
30+
credentials(HttpHeaderCredentials::class.java) {
31+
val username = p["mavenCentralUsername"]?.toString() ?: throw NullPointerException()
32+
val password = p["mavenCentralPassword"]?.toString() ?: throw NullPointerException()
33+
name = "Authorization"
34+
@OptIn(ExperimentalEncodingApi::class)
35+
value = "Bearer " + Base64.Mime.encode("$username:$password".encodeToByteArray())
3236
}
3337
}
3438
}

0 commit comments

Comments
 (0)