Skip to content
This repository was archived by the owner on Sep 11, 2023. It is now read-only.

Commit d8818dd

Browse files
rpalcolearpalcolea
committed
Gradle 8.0-rc-1
1 parent 70cce60 commit d8818dd

File tree

6 files changed

+32
-70
lines changed

6 files changed

+32
-70
lines changed

‎.github/workflows/nebula.yml‎

Lines changed: 2 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
strategy:
2323
matrix:
2424
# test against latest update of some major Java version(s), as well as specific LTS version(s)
25-
java: [ 8, 11, 17]
25+
java: [ 8 ]
2626
name: Gradle Build without Publish
2727
steps:
2828
- uses: actions/checkout@v1
@@ -31,10 +31,6 @@ jobs:
3131
with:
3232
java-version: 1.7
3333
- uses: actions/checkout@v1
34-
- name: Set up JDK 1.8
35-
uses: actions/setup-java@v1
36-
with:
37-
java-version: 1.8
3834
- name: Setup jdk
3935
uses: actions/setup-java@v1
4036
with:
@@ -55,15 +51,7 @@ jobs:
5551
- ${{ runner.os }}-gradlewrapper-
5652
- name: Gradle build
5753
run: ./gradlew --stacktrace build --scan
58-
- name: Post-success actions
59-
if: success()
60-
run: ./gradlew jacocoTestReport coveralls
61-
env:
62-
CI_NAME: github_actions
63-
CI_BUILD_NUMBER: ${{ github.sha }}
64-
CI_BUILD_URL: 'https://github.com/${{ github.repository }}'
65-
CI_BRANCH: ${{ github.ref }}
66-
COVERALLS_REPO_TOKEN: ${{ secrets.GITHUB_TOKEN }}
54+
6755
publish:
6856
if: startsWith(github.ref, 'refs/tags/v')
6957
needs: validation

‎build.gradle‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,13 @@
1616
*/
1717

1818
plugins {
19-
id 'com.netflix.nebula.plugin-plugin' version '20.0.0'
20-
id "org.jetbrains.kotlin.jvm" version "1.6.21"
19+
id 'com.netflix.nebula.plugin-plugin' version '20.2.0'
20+
id "org.jetbrains.kotlin.jvm" version "1.8.0"
2121
}
2222

2323
apply from: 'gradle/idea.gradle'
2424

25-
def kotlinVersion = '1.6.21'
25+
def kotlinVersion = '1.8.0'
2626

2727

2828
dependencies {

‎gradle.lockfile‎

Lines changed: 26 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -2,50 +2,41 @@
22
# Manual edits can break the build and are not advised.
33
# This file is expected to be part of source control.
44
cglib:cglib-nodep:3.2.2=integTestRuntimeClasspath,testRuntimeClasspath
5-
com.github.gundy:semver4j:0.16.4=integTestRuntimeClasspath,testRuntimeClasspath
6-
com.google.code.findbugs:jsr305:3.0.2=integTestRuntimeClasspath,testRuntimeClasspath
7-
com.google.code.gson:gson:2.8.9=integTestRuntimeClasspath,testRuntimeClasspath
8-
com.google.errorprone:error_prone_annotations:2.3.4=integTestRuntimeClasspath,testRuntimeClasspath
9-
com.google.guava:failureaccess:1.0.1=integTestRuntimeClasspath,testRuntimeClasspath
10-
com.google.guava:guava:29.0-jre=integTestRuntimeClasspath,testRuntimeClasspath
11-
com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=integTestRuntimeClasspath,testRuntimeClasspath
12-
com.google.j2objc:j2objc-annotations:1.3=integTestRuntimeClasspath,testRuntimeClasspath
135
com.netflix.nebula:nebula-gradle-interop:2.0.0=compileClasspath,integTestCompileClasspath,integTestRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
146
com.netflix.nebula:nebula-test:10.3.0=integTestCompileClasspath,integTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
15-
de.undercouch:gradle-download-task:4.1.1=integTestRuntimeClasspath,testRuntimeClasspath
167
junit:junit:4.13.2=integTestCompileClasspath,integTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
178
net.java.dev.jna:jna:5.6.0=integTestRuntimeClasspath,testRuntimeClasspath
189
org.apiguardian:apiguardian-api:1.1.2=integTestCompileClasspath,integTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
19-
org.checkerframework:checker-qual:2.11.1=integTestRuntimeClasspath,testRuntimeClasspath
2010
org.codehaus.groovy:groovy:3.0.9=integTestCompileClasspath,integTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
2111
org.hamcrest:hamcrest-core:1.3=integTestCompileClasspath,integTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
2212
org.hamcrest:hamcrest:2.2=integTestCompileClasspath,integTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
2313
org.jetbrains.intellij.deps:trove4j:1.0.20200330=integTestRuntimeClasspath,testRuntimeClasspath
24-
org.jetbrains.kotlin:kotlin-android-extensions:1.6.21=compileClasspath,integTestRuntimeClasspath,testRuntimeClasspath
25-
org.jetbrains.kotlin:kotlin-annotation-processing-gradle:1.6.21=compileClasspath,integTestRuntimeClasspath,testRuntimeClasspath
26-
org.jetbrains.kotlin:kotlin-build-common:1.6.21=compileClasspath,integTestRuntimeClasspath,testRuntimeClasspath
27-
org.jetbrains.kotlin:kotlin-compiler-embeddable:1.6.21=compileClasspath,integTestRuntimeClasspath,testRuntimeClasspath
28-
org.jetbrains.kotlin:kotlin-compiler-runner:1.6.21=compileClasspath,integTestRuntimeClasspath,testRuntimeClasspath
29-
org.jetbrains.kotlin:kotlin-daemon-client:1.6.21=compileClasspath,integTestRuntimeClasspath,testRuntimeClasspath
30-
org.jetbrains.kotlin:kotlin-daemon-embeddable:1.6.21=integTestRuntimeClasspath,testRuntimeClasspath
31-
org.jetbrains.kotlin:kotlin-gradle-plugin-api:1.6.21=compileClasspath,integTestCompileClasspath,integTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
32-
org.jetbrains.kotlin:kotlin-gradle-plugin-model:1.6.21=compileClasspath,integTestCompileClasspath,integTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
33-
org.jetbrains.kotlin:kotlin-gradle-plugin:1.6.21=compileClasspath,integTestCompileClasspath,integTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
34-
org.jetbrains.kotlin:kotlin-klib-commonizer-api:1.6.21=integTestRuntimeClasspath,testRuntimeClasspath
35-
org.jetbrains.kotlin:kotlin-native-utils:1.6.21=compileClasspath,integTestCompileClasspath,integTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
36-
org.jetbrains.kotlin:kotlin-project-model:1.6.21=compileClasspath,integTestCompileClasspath,integTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
37-
org.jetbrains.kotlin:kotlin-reflect:1.6.21=compileClasspath
38-
org.jetbrains.kotlin:kotlin-scripting-common:1.6.21=integTestRuntimeClasspath,testRuntimeClasspath
39-
org.jetbrains.kotlin:kotlin-scripting-compiler-embeddable:1.6.21=integTestRuntimeClasspath,testRuntimeClasspath
40-
org.jetbrains.kotlin:kotlin-scripting-compiler-impl-embeddable:1.6.21=integTestRuntimeClasspath,testRuntimeClasspath
41-
org.jetbrains.kotlin:kotlin-scripting-jvm:1.6.21=integTestRuntimeClasspath,testRuntimeClasspath
42-
org.jetbrains.kotlin:kotlin-stdlib-common:1.6.21=compileClasspath,integTestCompileClasspath,integTestRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
43-
org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.6.21=compileClasspath,integTestCompileClasspath,integTestRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
44-
org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.6.21=compileClasspath,integTestCompileClasspath,integTestRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
45-
org.jetbrains.kotlin:kotlin-stdlib:1.6.21=compileClasspath,integTestCompileClasspath,integTestRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
46-
org.jetbrains.kotlin:kotlin-tooling-metadata:1.6.21=integTestRuntimeClasspath,testRuntimeClasspath
47-
org.jetbrains.kotlin:kotlin-util-io:1.6.21=compileClasspath,integTestCompileClasspath,integTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
48-
org.jetbrains.kotlin:kotlin-util-klib:1.6.21=integTestRuntimeClasspath,testRuntimeClasspath
14+
org.jetbrains.kotlin:kotlin-android-extensions:1.8.0=compileClasspath,integTestRuntimeClasspath,testRuntimeClasspath
15+
org.jetbrains.kotlin:kotlin-annotation-processing-gradle:1.8.0=compileClasspath,integTestRuntimeClasspath,testRuntimeClasspath
16+
org.jetbrains.kotlin:kotlin-build-common:1.8.0=compileClasspath,integTestRuntimeClasspath,testRuntimeClasspath
17+
org.jetbrains.kotlin:kotlin-compiler-embeddable:1.8.0=compileClasspath,integTestRuntimeClasspath,testRuntimeClasspath
18+
org.jetbrains.kotlin:kotlin-compiler-runner:1.8.0=compileClasspath,integTestRuntimeClasspath,testRuntimeClasspath
19+
org.jetbrains.kotlin:kotlin-daemon-client:1.8.0=compileClasspath,integTestRuntimeClasspath,testRuntimeClasspath
20+
org.jetbrains.kotlin:kotlin-daemon-embeddable:1.8.0=integTestRuntimeClasspath,testRuntimeClasspath
21+
org.jetbrains.kotlin:kotlin-gradle-plugin-idea-proto:1.8.0=integTestRuntimeClasspath,testRuntimeClasspath
22+
org.jetbrains.kotlin:kotlin-gradle-plugin-idea:1.8.0=integTestRuntimeClasspath,testRuntimeClasspath
23+
org.jetbrains.kotlin:kotlin-gradle-plugin-model:1.8.0=compileClasspath,integTestCompileClasspath,integTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
24+
org.jetbrains.kotlin:kotlin-gradle-plugin:1.8.0=compileClasspath,integTestCompileClasspath,integTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
25+
org.jetbrains.kotlin:kotlin-klib-commonizer-api:1.8.0=integTestRuntimeClasspath,testRuntimeClasspath
26+
org.jetbrains.kotlin:kotlin-native-utils:1.8.0=integTestRuntimeClasspath,testRuntimeClasspath
27+
org.jetbrains.kotlin:kotlin-project-model:1.8.0=integTestRuntimeClasspath,testRuntimeClasspath
28+
org.jetbrains.kotlin:kotlin-reflect:1.8.0=compileClasspath
29+
org.jetbrains.kotlin:kotlin-scripting-common:1.8.0=integTestRuntimeClasspath,testRuntimeClasspath
30+
org.jetbrains.kotlin:kotlin-scripting-compiler-embeddable:1.8.0=integTestRuntimeClasspath,testRuntimeClasspath
31+
org.jetbrains.kotlin:kotlin-scripting-compiler-impl-embeddable:1.8.0=integTestRuntimeClasspath,testRuntimeClasspath
32+
org.jetbrains.kotlin:kotlin-scripting-jvm:1.8.0=integTestRuntimeClasspath,testRuntimeClasspath
33+
org.jetbrains.kotlin:kotlin-stdlib-common:1.8.0=compileClasspath,integTestCompileClasspath,integTestRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
34+
org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.8.0=compileClasspath,integTestCompileClasspath,integTestRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
35+
org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.0=compileClasspath,integTestCompileClasspath,integTestRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
36+
org.jetbrains.kotlin:kotlin-stdlib:1.8.0=compileClasspath,integTestCompileClasspath,integTestRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
37+
org.jetbrains.kotlin:kotlin-tooling-core:1.8.0=compileClasspath,integTestCompileClasspath,integTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
38+
org.jetbrains.kotlin:kotlin-util-io:1.8.0=integTestRuntimeClasspath,testRuntimeClasspath
39+
org.jetbrains.kotlin:kotlin-util-klib:1.8.0=integTestRuntimeClasspath,testRuntimeClasspath
4940
org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.5.0=compileClasspath,integTestRuntimeClasspath,testRuntimeClasspath
5041
org.jetbrains:annotations:13.0=compileClasspath,integTestCompileClasspath,integTestRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
5142
org.junit.platform:junit-platform-commons:1.8.1=integTestCompileClasspath,integTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath

‎gradle/wrapper/gradle-wrapper.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-rc-1-bin.zip
44
networkTimeout=10000
55
zipStoreBase=GRADLE_USER_HOME
66
zipStorePath=wrapper/dists

‎src/main/kotlin/nebula/plugin/compile/JavaCrossCompilePlugin.kt‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -70,13 +70,6 @@ class JavaCrossCompilePlugin @Inject constructor(private val providerFactory: Pr
7070
}
7171
}
7272
}
73-
//disable is useful when you have single jdk 11 on a machine and you target 8 in your build
74-
//can be removed when https://youtrack.jetbrains.com/issue/KT-29974 is resolved and we can use similar approach as for java
75-
if (! extension.disableKotlinSupport) {
76-
project.plugins.withId("kotlin") {
77-
configureKotlinCompiler(project, location)
78-
}
79-
}
8073
}
8174
}
8275
}

‎src/main/kotlin/nebula/plugin/compile/KotlinCompilerConfigurer.kt‎

Lines changed: 0 additions & 10 deletions
This file was deleted.

0 commit comments

Comments
 (0)