Skip to content

Commit b4f868f

Browse files
authored
Update dependencies (#14)
1 parent aabefda commit b4f868f

File tree

10 files changed

+275
-334
lines changed

10 files changed

+275
-334
lines changed

.kotlin-js-store/yarn.lock

Lines changed: 192 additions & 253 deletions
Large diffs are not rendered by default.

benchmarks/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
import io.matthewnelson.kmp.configuration.extension.container.target.KmpTarget
1717
import kotlinx.benchmark.gradle.BenchmarksExtension
1818
import org.jetbrains.kotlin.gradle.plugin.KotlinTarget
19-
import org.jetbrains.kotlin.gradle.targets.js.dsl.ExperimentalWasmDsl
19+
import org.jetbrains.kotlin.gradle.ExperimentalWasmDsl
2020
import org.jetbrains.kotlin.konan.target.HostManager
2121
import org.jetbrains.kotlin.konan.target.KonanTarget
2222

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

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,11 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
**/
16-
import io.matthewnelson.kmp.configuration.ExperimentalKmpConfigurationApi
1716
import io.matthewnelson.kmp.configuration.extension.KmpConfigurationExtension
1817
import io.matthewnelson.kmp.configuration.extension.container.target.KmpConfigurationContainerDsl
1918
import org.gradle.api.Action
2019
import org.gradle.api.JavaVersion
21-
import org.jetbrains.kotlin.gradle.targets.js.dsl.ExperimentalWasmDsl
20+
import org.jetbrains.kotlin.gradle.ExperimentalWasmDsl
2221

2322
fun KmpConfigurationExtension.configureShared(
2423
java9ModuleName: String? = null,
@@ -39,20 +38,17 @@ fun KmpConfigurationExtension.configureShared(
3938
compileSourceCompatibility = JavaVersion.VERSION_1_8
4039
compileTargetCompatibility = JavaVersion.VERSION_1_8
4140

42-
@OptIn(ExperimentalKmpConfigurationApi::class)
4341
java9ModuleInfoName = java9ModuleName
4442
}
4543

4644
js()
47-
4845
@OptIn(ExperimentalWasmDsl::class)
4946
wasmJs {
5047
target {
5148
browser()
5249
nodejs()
5350
}
5451
}
55-
5652
@OptIn(ExperimentalWasmDsl::class)
5753
wasmWasi {
5854
target {

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

Lines changed: 15 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -13,29 +13,33 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
**/
16-
import org.jetbrains.dokka.DokkaConfiguration.Visibility
17-
import org.jetbrains.dokka.gradle.DokkaTaskPartial
16+
import org.jetbrains.dokka.gradle.DokkaExtension
17+
import org.jetbrains.dokka.gradle.engine.parameters.VisibilityModifier
1818
import java.net.URI
1919

2020
plugins {
2121
id("org.jetbrains.dokka")
2222
}
2323

24-
tasks.withType<DokkaTaskPartial>().configureEach {
25-
suppressInheritedMembers = true
24+
rootProject.dependencies { dokka(project(project.path)) }
25+
26+
extensions.configure<DokkaExtension> {
27+
dokkaPublications.configureEach {
28+
suppressInheritedMembers.set(true)
29+
}
2630

2731
dokkaSourceSets.configureEach {
2832
includes.from("README.md")
29-
noStdlibLink = true
33+
enableKotlinStdLibDocumentationLink.set(false)
3034

3135
sourceLink {
32-
localDirectory = rootDir
33-
remoteUrl = URI("https://github.com/KotlinCrypto/bitops/tree/master").toURL()
34-
remoteLineSuffix = "#L"
36+
localDirectory.set(rootDir)
37+
remoteUrl.set(URI("https://github.com/KotlinCrypto/bitops/tree/master"))
38+
remoteLineSuffix.set("#L")
3539
}
3640

37-
documentedVisibilities.set(setOf(
38-
Visibility.PUBLIC,
39-
))
41+
documentedVisibilities(
42+
VisibilityModifier.Public,
43+
)
4044
}
4145
}

gh-pages/publish.sh

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,20 +15,21 @@
1515
set -e
1616

1717
readonly DIR_SCRIPT="$( cd "$( dirname "$0" )" >/dev/null && pwd )"
18+
readonly REPO_NAME="bitops"
1819

19-
trap 'rm -rf "$DIR_SCRIPT/bitops"' EXIT
20+
trap 'rm -rf "$DIR_SCRIPT/$REPO_NAME"' EXIT
2021

2122
cd "$DIR_SCRIPT"
22-
git clone -b gh-pages --single-branch https://github.com/KotlinCrypto/bitops.git
23-
rm -rf "$DIR_SCRIPT/bitops/"*
24-
echo "bitops.kotlincrypto.org" > "$DIR_SCRIPT/bitops/CNAME"
23+
git clone -b gh-pages --single-branch https://github.com/KotlinCrypto/$REPO_NAME.git
24+
rm -rf "$DIR_SCRIPT/$REPO_NAME/"*
25+
echo "$REPO_NAME.kotlincrypto.org" > "$DIR_SCRIPT/$REPO_NAME/CNAME"
2526

2627
cd ..
2728
./gradlew clean -DKMP_TARGETS_ALL
28-
./gradlew dokkaHtmlMultiModule --no-build-cache -DKMP_TARGETS_ALL
29-
cp -aR build/dokka/htmlMultiModule/* gh-pages/bitops
29+
./gradlew dokkaGenerate --no-build-cache -DKMP_TARGETS_ALL
30+
cp -aR build/dokka/html/* gh-pages/$REPO_NAME
3031

31-
cd "$DIR_SCRIPT/bitops"
32+
cd "$DIR_SCRIPT/$REPO_NAME"
3233
sed -i "s|module:|module:library/|g" "package-list"
3334

3435
git add --all

gradle.properties

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,9 @@ kotlin.mpp.applyDefaultHierarchyTemplate=false
77
kotlin.mpp.stability.nowarn=true
88
kotlin.native.ignoreDisabledTargets=true
99

10+
org.jetbrains.dokka.experimental.gradle.pluginMode=V2Enabled
11+
org.jetbrains.dokka.experimental.gradle.pluginMode.noWarn=true
12+
1013
SONATYPE_HOST=S01
1114
RELEASE_SIGNING_ENABLED=true
1215

@@ -27,10 +30,10 @@ POM_DEVELOPER_ID=KotlinCrypto
2730
POM_DEVELOPER_NAME=Kotlin Crypto
2831
POM_DEVELOPER_URL=https://github.com/KotlinCrypto/
2932

30-
VERSION_NAME=0.1.3-SNAPSHOT
33+
VERSION_NAME=0.2.0-SNAPSHOT
3134
# 0.1.0-alpha01 = 00 01 00 11
3235
# 0.1.0-beta01 = 00 01 00 21
3336
# 0.1.0-rc01 = 00 01 00 31
3437
# 0.1.0 = 00 01 00 99
3538
# 1.1.0 = 01 01 00 99
36-
VERSION_CODE=00010399
39+
VERSION_CODE=00020099

gradle/libs.versions.toml

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,21 @@
11
[versions]
2-
gradle-benchmark = "0.4.11"
3-
gradle-binary-compat = "0.16.3"
4-
gradle-dokka = "1.9.20"
5-
gradle-kmp-configuration = "0.3.2"
6-
gradle-kotlin = "1.9.24"
7-
gradle-publish-maven = "0.29.0"
2+
gradle-benchmark = "0.4.13"
3+
gradle-binary-compat = "0.17.0"
4+
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"
88

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

12-
gradle-dokka = { module = "org.jetbrains.dokka:dokka-gradle-plugin", version.ref = "gradle-dokka" }
13-
gradle-kmp-configuration = { module = "io.matthewnelson:gradle-kmp-configuration-plugin", version.ref = "gradle-kmp-configuration" }
14-
gradle-kotlin = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin", version.ref = "gradle-kotlin" }
15-
gradle-publish-maven = { module = "com.vanniktech:gradle-maven-publish-plugin", version.ref = "gradle-publish-maven" }
12+
gradle-dokka = { module = "org.jetbrains.dokka:dokka-gradle-plugin", version.ref = "gradle-dokka" }
13+
gradle-kmp-configuration = { module = "io.matthewnelson:gradle-kmp-configuration-plugin", version.ref = "gradle-kmp-configuration" }
14+
gradle-kotlin = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin", version.ref = "gradle-kotlin" }
15+
gradle-publish-maven = { module = "com.vanniktech:gradle-maven-publish-plugin", version.ref = "gradle-publish-maven" }
1616

1717
[plugins]
18-
benchmark = { id = "org.jetbrains.kotlinx.benchmark", version.ref = "gradle-benchmark" }
19-
binary-compat = { id = "org.jetbrains.kotlinx.binary-compatibility-validator", version.ref = "gradle-binary-compat" }
20-
dokka = { id = "org.jetbrains.dokka", version.ref = "gradle-dokka" }
21-
kotlin-multiplatform = { id = "org.jetbrains.kotlin.multiplatform", version.ref = "gradle-kotlin" }
18+
benchmark = { id = "org.jetbrains.kotlinx.benchmark", version.ref = "gradle-benchmark" }
19+
binary-compat = { id = "org.jetbrains.kotlinx.binary-compatibility-validator", version.ref = "gradle-binary-compat" }
20+
dokka = { id = "org.jetbrains.dokka", version.ref = "gradle-dokka" }
21+
kotlin-multiplatform = { id = "org.jetbrains.kotlin.multiplatform", version.ref = "gradle-kotlin" }

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=f8b4f4772d302c8ff580bc40d0f56e715de69b163546944f787c87abf209c961
8-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-all.zip
7+
distributionSha256Sum=296742a352f0b20ec14b143fb684965ad66086c7810b7b255dee216670716175
8+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.12.1-all.zip

library/bits/api/bits.klib.api

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -84,8 +84,6 @@ sealed class org.kotlincrypto.bitops.bits/Counter { // org.kotlincrypto.bitops.b
8484
}
8585

8686
sealed class Final { // org.kotlincrypto.bitops.bits/Counter.Final|null[0]
87-
constructor <init>(kotlin/Boolean) // org.kotlincrypto.bitops.bits/Counter.Final.<init>|<init>(kotlin.Boolean){}[0]
88-
8987
final val isBits // org.kotlincrypto.bitops.bits/Counter.Final.isBits|{}isBits[0]
9088
final fun <get-isBits>(): kotlin/Boolean // org.kotlincrypto.bitops.bits/Counter.Final.isBits.<get-isBits>|<get-isBits>(){}[0]
9189

0 commit comments

Comments
 (0)