Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Dependencies update #265

Merged
merged 3 commits into from
May 21, 2024
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
2 changes: 2 additions & 0 deletions build-logic/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -20,4 +20,6 @@ plugins {

dependencies {
implementation(libs.kotlin.gradle.plugin)
implementation(libs.kotlinx.bcv.gradle.plugin)
implementation(libs.kotlinx.atomicfu.gradle.plugin)
}
20 changes: 20 additions & 0 deletions build-logic/src/main/kotlin/rsocketbuild.atomicfu.gradle.kts
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
/*
* Copyright 2015-2024 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/

// this convention plugin will be not needed after https://github.com/Kotlin/kotlinx-atomicfu/issues/56
plugins {
id("kotlinx-atomicfu")
}
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
plugins {
id("rsocketbuild.multiplatform-base")
id("rsocketbuild.publication")
id("org.jetbrains.kotlinx.binary-compatibility-validator")
}

kotlin {
Expand Down
4 changes: 2 additions & 2 deletions build-settings/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ plugins {
}

dependencies {
implementation("com.gradle:gradle-enterprise-gradle-plugin:3.16.2")
implementation("com.gradle:common-custom-user-data-gradle-plugin:1.12.1")
implementation("com.gradle:gradle-enterprise-gradle-plugin:3.17.3")
implementation("com.gradle:common-custom-user-data-gradle-plugin:2.0.1")
implementation("org.gradle.toolchains:foojay-resolver:0.8.0")
}
Original file line number Diff line number Diff line change
Expand Up @@ -15,14 +15,16 @@
*/

plugins {
id("com.gradle.enterprise")
id("com.gradle.develocity")
id("com.gradle.common-custom-user-data-gradle-plugin")
id("org.gradle.toolchains.foojay-resolver-convention")
}

gradleEnterprise {
develocity {
buildScan {
publishAlwaysIf(System.getenv("CI").toBoolean())
publishing {
onlyIf { System.getenv("CI").toBoolean() }
}
}
}

Expand Down
34 changes: 9 additions & 25 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -14,34 +14,18 @@
* limitations under the License.
*/

import org.jetbrains.kotlin.gradle.targets.js.yarn.*

buildscript {
dependencies {
// kotlinx.atomicfu should be on classpath
// it's an implementation detail of kotlinx.atomicfu gradle plugin
classpath(libs.kotlin.gradle.plugin)
classpath(libs.kotlinx.atomicfu.gradle.plugin)
}
}
import org.jetbrains.kotlin.gradle.targets.js.nodejs.*
import org.jetbrains.kotlin.gradle.targets.js.npm.*

plugins {
// for now BCV uses `allProjects` internally, so we can't apply it just to specific subprojects
alias(libs.plugins.kotlinx.bcv)
}

apiValidation {
ignoredProjects.addAll(
listOf(
"rsocket-test",
"rsocket-transport-tests"
)
)
alias(libs.plugins.kotlin.multiplatform) apply false
}

plugins.withType<YarnPlugin> {
yarn.apply {
lockFileDirectory = file("gradle/js/yarn")
yarnLockMismatchReport = YarnLockMismatchReport.WARNING
plugins.withType<NodeJsRootPlugin> {
// ignore package lock
extensions.configure<NpmExtension> {
lockFileDirectory.set(layout.buildDirectory.dir("kotlin-js-store"))
packageLockMismatchReport.set(LockFileMismatchReport.NONE)
packageLockAutoReplace.set(true)
}
}
3 changes: 2 additions & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,12 @@ version=0.16.0-SNAPSHOT
kotlin.mpp.import.enableKgpDependencyResolution=true
kotlin.native.ignoreDisabledTargets=true
kotlin.native.ignoreIncorrectDependencies=true
kotlin.js.yarn=false
kotlinx.atomicfu.enableJvmIrTransformation=true
kotlinx.atomicfu.enableJsIrTransformation=true
kotlinx.atomicfu.enableNativeIrTransformation=true
#Gradle
org.gradle.jvmargs=-Xmx2g
org.gradle.jvmargs=-Xmx4g
org.gradle.parallel=true
org.gradle.caching=true
org.gradle.configuration-cache=true
Expand Down
Loading