Skip to content

Commit 30dfa3f

Browse files
authored
Update dependencies (#41)
* 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.2 * Update kotlin: 2.1.10 -> 2.2.10 * Update cklib: 0.3.3 -> 0.3.4 * Update kotlinx-benchmark: 0.4.13 -> 0.4.14 * Update gradle-android: 8.7.3 -> 8.10.0 * Update androidx-test-{core/runner}: {1.6.1/1.6.2} -> 1.7.0 * Update kmp-process: 0.2.1 -> 0.3.2
1 parent 0cdec29 commit 30dfa3f

15 files changed

Lines changed: 2609 additions & 355 deletions

File tree

.github/workflows/CI.yml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ jobs:
5050
5151
- name: Upload Test Reports
5252
uses: actions/upload-artifact@v4
53-
if: ${{ always() }}
53+
if: always()
5454
with:
5555
name: test-report-${{ matrix.os }}
5656
path: '**/build/reports/tests/**'
@@ -151,8 +151,10 @@ jobs:
151151

152152
- name: Upload Test Reports
153153
uses: actions/upload-artifact@v4
154-
if: ${{ always() }}
154+
if: always()
155155
with:
156156
name: test-report-android-${{ matrix.api-level }}-${{ matrix.arch }}
157-
path: '**/build/reports/androidTests/**'
157+
path: |
158+
**/build/reports/androidTests/**
159+
**/build/outputs/androidTest-results/connected/debug/*/logcat-*.txt
158160
retention-days: 1
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.

RELEASING.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Releasing
1+
# RELEASING
22

33
See [KotlinCrypto/documentation/RELEASING.md][url-kotlincrypto-releasing]
44

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
import org.jetbrains.kotlin.konan.target.HostManager
2221

@@ -35,10 +34,6 @@ fun KmpConfigurationExtension.configureShared(
3534
}
3635

3736
jvm {
38-
kotlinJvmTarget = JavaVersion.VERSION_1_8
39-
compileSourceCompatibility = JavaVersion.VERSION_1_8
40-
compileTargetCompatibility = JavaVersion.VERSION_1_8
41-
4237
// Windows cries if Java 11 is not installed...
4338
if (!HostManager.hostIsMingw) {
4439
java9ModuleInfoName = java9ModuleName

build-logic/src/main/kotlin/publication.gradle.kts

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -13,18 +13,10 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
**/
16-
import org.gradle.plugins.signing.SigningExtension
17-
1816
plugins {
1917
id("com.vanniktech.maven.publish")
2018
}
2119

22-
if (!version.toString().endsWith("-SNAPSHOT")) {
23-
extensions.configure<SigningExtension>("signing") {
24-
useGpgCmd()
25-
}
26-
}
27-
2820
tasks.withType<AbstractArchiveTask>().configureEach {
2921
isPreserveFileTimestamps = false
3022
isReproducibleFileOrder = true

build.gradle.kts

Lines changed: 13 additions & 4 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.android.library) apply(false)
@@ -38,7 +40,7 @@ allprojects {
3840
// Only allow snapshot dependencies for non-release versions.
3941
// This would cause a build failure if attempting to make a release
4042
// while depending on a -SNAPSHOT version (such as core).
41-
maven("https://s01.oss.sonatype.org/content/repositories/snapshots/")
43+
maven("https://central.sonatype.com/repository/maven-snapshots/")
4244
}
4345
}
4446
}
@@ -47,9 +49,16 @@ allprojects {
4749
val CHECK_PUBLICATION = findProperty("CHECK_PUBLICATION") != null
4850

4951
plugins.withType<YarnPlugin> {
50-
the<YarnRootExtension>().lockFileDirectory = rootDir.resolve(".kotlin-js-store")
51-
if (CHECK_PUBLICATION) {
52-
the<YarnRootExtension>().yarnLockMismatchReport = YarnLockMismatchReport.NONE
52+
the<YarnRootExtension>().apply {
53+
lockFileDirectory = rootDir.resolve(".kotlin-js-store").resolve("js")
54+
if (CHECK_PUBLICATION) yarnLockMismatchReport = YarnLockMismatchReport.NONE
55+
}
56+
}
57+
58+
plugins.withType<WasmYarnPlugin> {
59+
the<WasmYarnRootExtension>().apply {
60+
lockFileDirectory = rootDir.resolve(".kotlin-js-store").resolve("wasm")
61+
if (CHECK_PUBLICATION) yarnLockMismatchReport = YarnLockMismatchReport.NONE
5362
}
5463
}
5564

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
@@ -14,7 +14,7 @@ kotlin.native.ignoreDisabledTargets=true
1414
org.jetbrains.dokka.experimental.gradle.pluginMode=V2Enabled
1515
org.jetbrains.dokka.experimental.gradle.pluginMode.noWarn=true
1616

17-
SONATYPE_HOST=S01
17+
SONATYPE_HOST=CENTRAL_PORTAL
1818
RELEASE_SIGNING_ENABLED=true
1919

2020
GROUP=org.kotlincrypto.random

gradle/libs.versions.toml

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
[versions]
2-
androidx-test-core = "1.6.1"
3-
androidx-test-runner = "1.6.2"
2+
androidx-test-core = "1.7.0"
3+
androidx-test-runner = "1.7.0"
44

5-
gradle-android = "8.7.3"
6-
gradle-benchmark = "0.4.13"
7-
gradle-binary-compat = "0.17.0"
8-
gradle-cklib = "0.3.3"
5+
gradle-android = "8.10.0"
6+
gradle-benchmark = "0.4.14"
7+
gradle-binary-compat = "0.18.1"
8+
gradle-cklib = "0.3.4"
99
gradle-dokka = "2.0.0"
10-
gradle-kmp-configuration = "0.4.0"
11-
gradle-kotlin = "2.1.10"
12-
gradle-publish-maven = "0.30.0"
10+
gradle-kmp-configuration = "0.5.2"
11+
gradle-kotlin = "2.2.10"
12+
gradle-publish-maven = "0.34.0"
1313

14-
kmp-process = "0.2.1"
15-
kotlincrypto-error = "0.3.0"
14+
kmp-process = "0.3.2"
15+
kotlincrypto-error = "0.3.0" # TODO: Update
1616

1717
[libraries]
1818
gradle-dokka = { module = "org.jetbrains.dokka:dokka-gradle-plugin", version.ref = "gradle-dokka" }

0 commit comments

Comments
 (0)