Skip to content

Commit 69f2f3d

Browse files
committed
Revert "Verify parent path is not-null"
This reverts commit 84a5c91. Revert "Migrate Shadow plugin to new plugin ID" This reverts commit 1add411. Revert "Bump Gradle from 8.14.3 to 9.0.0" This reverts commit 8fa604c.
1 parent 8f62b1a commit 69f2f3d

File tree

5 files changed

+7
-7
lines changed

5 files changed

+7
-7
lines changed

buildSrc/src/main/kotlin/ApplyArgbash.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,10 +42,10 @@ abstract class ApplyArgbash @Inject constructor(
4242
fun applyArgbash() {
4343
val argbash = argbashHome.get().file("bin/argbash").asFile
4444
scriptTemplates.get().visit {
45-
val parentRelativePath = relativePath.parent?.pathString
46-
if (!isDirectory && parentRelativePath != null) {
45+
if(!isDirectory) {
46+
val relPath = relativePath.parent.pathString
4747
val basename = file.nameWithoutExtension
48-
val outputFile = outputDir.get().file("$parentRelativePath/$basename.sh").asFile
48+
val outputFile = outputDir.get().file("$relPath/$basename.sh").asFile
4949
outputFile.parentFile.mkdirs()
5050

5151
logger.info("Applying argbash to $file")

components/configure-develocity-maven-extension/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
plugins {
22
id("java")
3-
id("com.gradleup.shadow") version "8.3.8"
3+
id("com.github.johnrengelman.shadow") version "8.1.1"
44
}
55

66
repositories {

gradle/wrapper/gradle-wrapper.jar

-1.65 KB
Binary file not shown.

gradle/wrapper/gradle-wrapper.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionSha256Sum=8fad3d78296ca518113f3d29016617c7f9367dc005f932bd9d93bf45ba46072b
4-
distributionUrl=https\://services.gradle.org/distributions/gradle-9.0.0-bin.zip
3+
distributionSha256Sum=bd71102213493060956ec229d946beee57158dbd89d0e62b91bca0fa2c5f3531
4+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip
55
networkTimeout=10000
66
validateDistributionUrl=true
77
zipStoreBase=GRADLE_USER_HOME

gradlew

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/bin/sh
22

33
#
4-
# Copyright © 2015 the original authors.
4+
# Copyright © 2015-2021 the original authors.
55
#
66
# Licensed under the Apache License, Version 2.0 (the "License");
77
# you may not use this file except in compliance with the License.

0 commit comments

Comments
 (0)