Skip to content

Commit bb0594b

Browse files
committed
chore: build logic changes
1 parent 311854d commit bb0594b

File tree

7 files changed

+96
-209
lines changed

7 files changed

+96
-209
lines changed

gradle/build-logic/README.md

Lines changed: 0 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -8,45 +8,6 @@ $ ./gradlew checkBuildLogicBestPractices
88
# ./gradlew -p gradle/build-logic checkBestPractices
99
```
1010

11-
#### Submit Dependency Graph to [Github Dependabot](https://github.com/gradle/github-dependency-graph-gradle-plugin)
12-
13-
* init.gradle.kts
14-
15-
```kotlin
16-
import org.gradle.github.GitHubDependencyGraphPlugin
17-
18-
initscript {
19-
repositories {
20-
mavenCentral()
21-
gradlePluginPortal()
22-
}
23-
dependencies { classpath("org.gradle:github-dependency-graph-gradle-plugin:+") }
24-
}
25-
26-
apply<GitHubDependencyGraphPlugin>()
27-
```
28-
29-
* Run
30-
31-
```bash
32-
$ export GITHUB_DEPENDENCY_GRAPH_JOB_ID="42"
33-
export GITHUB_DEPENDENCY_GRAPH_JOB_CORRELATOR="dep-graph"
34-
export GITHUB_REF="refs/heads/main"
35-
export GITHUB_SHA=$(git rev-parse HEAD)
36-
export GITHUB_WORKSPACE=$(pwd)
37-
38-
$ ./gradlew -init-script gradle/build-logic/init.gradle.kts build
39-
40-
# Submit the dependency graph to GitHub
41-
$ curl -L \
42-
-X POST \
43-
-H "Accept: application/vnd.github+json" \
44-
-H "Authorization: Bearer $GITHUB_TOKEN"\
45-
-H "X-GitHub-Api-Version: 2022-11-28" \
46-
https://api.github.com/repos/gradle/github-dependency-graph-gradle-plugin/dependency-graph/snapshots \
47-
-d @build/reports/github-dependency-graph-snapshots/${GITHUB_DEPENDENCY_GRAPH_JOB_CORRELATOR}.json
48-
```
49-
5011
#### References
5112

5213
* [Gradle Best Practices](https://github.com/liutikas/gradle-best-practices)

gradle/build-logic/build.gradle.kts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
@file:Suppress("UnstableApiUsage")
22

3+
import com.diffplug.spotless.kotlin.KtfmtStep
34
import org.jetbrains.kotlin.gradle.dsl.*
45

56
plugins {
@@ -9,7 +10,7 @@ plugins {
910
alias(libs.plugins.jte)
1011
alias(libs.plugins.benmanes)
1112
alias(libs.plugins.spotless)
12-
alias(libs.plugins.autonomousapps.bestpractices)
13+
// alias(libs.plugins.autonomousapps.bestpractices)
1314
// alias(libs.plugins.kotlin.dsl)
1415
}
1516

@@ -46,7 +47,7 @@ kotlin {
4647
}
4748

4849
spotless {
49-
val ktfmtVersion = libs.versions.ktfmt.get()
50+
val ktfmtVersion = maxOf(KtfmtStep.defaultVersion(), libs.versions.ktfmt.get())
5051
kotlin {
5152
target("src/**/*.kts", "src/**/*.kt")
5253
ktfmt(ktfmtVersion)
@@ -176,7 +177,6 @@ dependencies {
176177
implementation(libs.build.mrjar.plugin)
177178
implementation(libs.build.semver.plugin)
178179
implementation(libs.build.benmanesversions)
179-
implementation(libs.build.dependencyanalysis)
180180
implementation(libs.build.tasktree)
181181
implementation(libs.build.foojay.resolver)
182182
implementation(libs.build.nativeimage.plugin)
@@ -197,7 +197,7 @@ dependencies {
197197
// implementation(libs.jte.native)
198198
// implementation(libs.build.kmp.hierarchy)
199199
// implementation(libs.build.includegit.plugin)
200-
// implementation(libs.build.cyclonedx.plugin)
200+
// implementation(libs.build.dependencyanalysis)
201201

202202
testImplementation(gradleTestKit())
203203
// For using kotlin-dsl in pre-compiled script plugins

gradle/build-logic/src/main/kotlin/common/ProjectExtns.kt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -412,7 +412,6 @@ fun KotlinCommonCompilerOptions.configureKotlinCommon(project: Project) =
412412
"kotlin.ExperimentalMultiplatform",
413413
"kotlin.js.ExperimentalJsExport",
414414
"kotlin.experimental.ExperimentalNativeApi",
415-
"kotlinx.cinterop.ExperimentalForeignApi",
416415
"kotlin.uuid.ExperimentalUuidApi",
417416
// "org.jetbrains.kotlin.compiler.plugin.ExperimentalCompilerApi",
418417
)

gradle/build-logic/src/main/kotlin/dev.suresh.plugin.kotlin.docs.gradle.kts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
import com.diffplug.spotless.kotlin.KtfmtStep
12
import common.*
23
import java.time.Year
34
import org.hildan.github.changelog.plugin.GitHubChangelogExtension
@@ -89,7 +90,7 @@ spotless {
8990
}
9091
// if(plugins.hasPlugin(JavaPlugin::class.java)){ }
9192

92-
val ktfmtVersion = libs.versions.ktfmt.get()
93+
val ktfmtVersion = maxOf(KtfmtStep.defaultVersion(), libs.versions.ktfmt.get())
9394
kotlin {
9495
ktfmt(ktfmtVersion)
9596
target("src/**/*.kts", "src/**/*.kt")

gradle/build-logic/src/main/kotlin/dev.suresh.plugin.repos.settings.gradle.kts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,6 @@ plugins {
5151
id("com.gradle.develocity")
5252
id("org.gradle.toolchains.foojay-resolver")
5353
id("org.jetbrains.kotlinx.kover.aggregation")
54-
id("com.autonomousapps.build-health")
5554
id("com.javiersc.semver")
5655
// id("dev.suresh.plugin.include")
5756
}

0 commit comments

Comments
 (0)