Skip to content

Commit 66d6dd4

Browse files
committed
Update Gradle to 7.4.2
1 parent 24d59e3 commit 66d6dd4

File tree

24 files changed

+732
-514
lines changed

24 files changed

+732
-514
lines changed

.github/workflows/ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
- uses: sdkman/sdkman-action@master
1717
with:
1818
candidate: gradle
19-
version: 6.7.1
19+
version: 7.4.2
2020

2121
- name: Install Kotlin
2222
run: |
@@ -45,7 +45,7 @@ jobs:
4545
run: ./gradlew danger-kotlin-library:test
4646

4747
- name: Install Plugin Installer
48-
run: ./gradlew danger-plugin-installer:install
48+
run: ./gradlew danger-plugin-installer:publishToMavenLocal
4949

5050
- name: Build and Install Sample Plugin
5151
run: |

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM gradle:5.6.2-jdk8
1+
FROM gradle:7.4.2-jdk8
22

33
MAINTAINER Franco Meloni
44

Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,12 @@ install: build
1515

1616
build:
1717
./gradlew build -p danger-plugin-installer
18-
./gradlew install -p danger-plugin-installer
18+
./gradlew publishToMavenLocal -p danger-plugin-installer
1919
./gradlew shadowJar -p danger-kotlin-library
2020
./gradlew build -p danger-kotlin-kts
2121
./gradlew build -p danger-kotlin
2222

2323
uninstall:
2424
rm -rf $(INSTALL_PATH)
2525
rm -f $(LIB_INSTALL_PATH)/danger-kotlin.jar
26-
rm -f $(LIB_FLAT_DIR)
26+
rm -rf $(LIB_FLAT_DIR)

configurations.gradle

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,8 @@
11
configurations {
2-
provided
3-
compile.extendsFrom provided
42
implementation.extendsFrom includeJar {
53
transitive = false
64
}
75
api.extendsFrom includeRecursiveJar {
86
transitive = true
97
}
10-
}
8+
}

danger-kotlin-kts/build.gradle

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,14 @@ apply from: file('../dependencyVersions.gradle')
1818
apply from: file('version.gradle')
1919

2020
dependencies {
21-
provided "org.jetbrains.kotlin:kotlin-stdlib-jdk8"
22-
provided "org.jetbrains.kotlin:kotlin-script-runtime:$versionKotlin"
23-
provided "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.1.0"
21+
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8"
22+
implementation "org.jetbrains.kotlin:kotlin-script-runtime:$versionKotlin"
23+
implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.1.0"
2424
includeJar "org.jetbrains.kotlin:kotlin-main-kts:$versionKotlin"
2525
}
2626

2727
shadowJar {
28-
baseName = 'danger-kotlin-kts'
28+
getArchiveBaseName().set('danger-kotlin-kts')
2929
}
3030

3131
compileKotlin {
@@ -41,4 +41,4 @@ publishing {
4141
from components.java
4242
}
4343
}
44-
}
44+
}

danger-kotlin-library/build.gradle

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,10 @@ apply from: file('version.gradle')
99
apply plugin: 'kotlinx-serialization'
1010

1111
shadowJar {
12-
baseName = 'danger-kotlin'
13-
classifier = null
14-
version = null
12+
getArchiveBaseName().set('danger-kotlin')
13+
getArchiveAppendix().set('')
14+
getArchiveClassifier().set('')
15+
getArchiveVersion().set('')
1516
}
1617

1718
test {

danger-kotlin-library/dependencies.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ apply plugin: 'com.github.johnrengelman.shadow'
22
apply from: file('../dependencyVersions.gradle')
33

44
dependencies {
5-
provided "org.jetbrains.kotlin:kotlin-stdlib-jdk8"
5+
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8"
66
includeJar project(":danger-kotlin-sdk")
77
includeJar project(":danger-kotlin-kts")
88
utilsDependencies()
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-5.0-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-bin.zip
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists

0 commit comments

Comments
 (0)