-
Notifications
You must be signed in to change notification settings - Fork 4.7k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #2039 from Netflix/fix-build
Upgrade to Gradle 8.1.1
- Loading branch information
Showing
22 changed files
with
250 additions
and
186 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,45 @@ | ||
| name: "CI" | ||
| on: | ||
| push: | ||
| branches: | ||
| - '*' | ||
| tags-ignore: | ||
| - '*' | ||
| pull_request: | ||
|
|
||
| jobs: | ||
| build: | ||
| runs-on: ubuntu-latest | ||
| strategy: | ||
| matrix: | ||
| # test against JDK 8 | ||
| java: [ 8 ] | ||
| name: CI with Java ${{ matrix.java }} | ||
| steps: | ||
| - uses: actions/checkout@v1 | ||
| - name: Setup jdk | ||
| uses: actions/setup-java@v1 | ||
| with: | ||
| java-version: ${{ matrix.java }} | ||
| - uses: actions/cache@v1 | ||
| id: gradle-cache | ||
| with: | ||
| path: ~/.gradle/caches | ||
| key: ${{ runner.os }}-gradle-${{ hashFiles('**/gradle/dependency-locks/*.lockfile') }} | ||
| restore-keys: | | ||
| - ${{ runner.os }}-gradle- | ||
| - uses: actions/cache@v1 | ||
| id: gradle-wrapper-cache | ||
| with: | ||
| path: ~/.gradle/wrapper | ||
| key: ${{ runner.os }}-gradlewrapper-${{ hashFiles('gradle/wrapper/*') }} | ||
| restore-keys: | | ||
| - ${{ runner.os }}-gradlewrapper- | ||
| - name: Build with Gradle | ||
| run: ./gradlew --info --stacktrace build | ||
| env: | ||
| CI_NAME: github_actions | ||
| CI_BUILD_NUMBER: ${{ github.sha }} | ||
| CI_BUILD_URL: 'https://github.com/${{ github.repository }}' | ||
| CI_BRANCH: ${{ github.ref }} | ||
| COVERALLS_REPO_TOKEN: ${{ secrets.GITHUB_TOKEN }} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,51 @@ | ||
| name: "Publish candidate/release to NetflixOSS and Maven Central" | ||
| on: | ||
| push: | ||
| tags: | ||
| - v*.*.* | ||
| - v*.*.*-rc.* | ||
| release: | ||
| types: | ||
| - published | ||
|
|
||
| jobs: | ||
| build: | ||
| runs-on: ubuntu-latest | ||
| steps: | ||
| - uses: actions/checkout@v1 | ||
| - name: Setup jdk 8 | ||
| uses: actions/setup-java@v1 | ||
| with: | ||
| java-version: 1.8 | ||
| - uses: actions/cache@v1 | ||
| id: gradle-cache | ||
| with: | ||
| path: ~/.gradle/caches | ||
| key: ${{ runner.os }}-gradle-${{ hashFiles('**/gradle/dependency-locks/*.lockfile') }} | ||
| restore-keys: | | ||
| - ${{ runner.os }}-gradle- | ||
| - uses: actions/cache@v1 | ||
| id: gradle-wrapper-cache | ||
| with: | ||
| path: ~/.gradle/wrapper | ||
| key: ${{ runner.os }}-gradlewrapper-${{ hashFiles('gradle/wrapper/*') }} | ||
| restore-keys: | | ||
| - ${{ runner.os }}-gradlewrapper- | ||
| - name: Publish candidate | ||
| if: contains(github.ref, '-rc.') | ||
| run: ./gradlew --info --stacktrace -Prelease.useLastTag=true candidate | ||
| env: | ||
| NETFLIX_OSS_SIGNING_KEY: ${{ secrets.ORG_SIGNING_KEY }} | ||
| NETFLIX_OSS_SIGNING_PASSWORD: ${{ secrets.ORG_SIGNING_PASSWORD }} | ||
| NETFLIX_OSS_REPO_USERNAME: ${{ secrets.ORG_NETFLIXOSS_USERNAME }} | ||
| NETFLIX_OSS_REPO_PASSWORD: ${{ secrets.ORG_NETFLIXOSS_PASSWORD }} | ||
| - name: Publish release | ||
| if: (!contains(github.ref, '-rc.')) | ||
| run: ./gradlew --info -Prelease.useLastTag=true final | ||
| env: | ||
| NETFLIX_OSS_SONATYPE_USERNAME: ${{ secrets.ORG_SONATYPE_USERNAME }} | ||
| NETFLIX_OSS_SONATYPE_PASSWORD: ${{ secrets.ORG_SONATYPE_PASSWORD }} | ||
| NETFLIX_OSS_SIGNING_KEY: ${{ secrets.ORG_SIGNING_KEY }} | ||
| NETFLIX_OSS_SIGNING_PASSWORD: ${{ secrets.ORG_SIGNING_PASSWORD }} | ||
| NETFLIX_OSS_REPO_USERNAME: ${{ secrets.ORG_NETFLIXOSS_USERNAME }} | ||
| NETFLIX_OSS_REPO_PASSWORD: ${{ secrets.ORG_NETFLIXOSS_PASSWORD }} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,37 @@ | ||
| name: "Publish snapshot to NetflixOSS and Maven Central" | ||
|
|
||
| on: | ||
| push: | ||
| branches: | ||
| - master | ||
|
|
||
| jobs: | ||
| build: | ||
| runs-on: ubuntu-latest | ||
| steps: | ||
| - uses: actions/checkout@v2 | ||
| with: | ||
| fetch-depth: 0 | ||
| - name: Set up JDK | ||
| uses: actions/setup-java@v1 | ||
| with: | ||
| java-version: 8 | ||
| - uses: actions/cache@v2 | ||
| id: gradle-cache | ||
| with: | ||
| path: | | ||
| ~/.gradle/caches | ||
| key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle') }} | ||
| - uses: actions/cache@v2 | ||
| id: gradle-wrapper-cache | ||
| with: | ||
| path: | | ||
| ~/.gradle/wrapper | ||
| key: ${{ runner.os }}-gradlewrapper-${{ hashFiles('gradle/wrapper/*') }} | ||
| - name: Build | ||
| run: ./gradlew build snapshot | ||
| env: | ||
| NETFLIX_OSS_SIGNING_KEY: ${{ secrets.ORG_SIGNING_KEY }} | ||
| NETFLIX_OSS_SIGNING_PASSWORD: ${{ secrets.ORG_SIGNING_PASSWORD }} | ||
| NETFLIX_OSS_REPO_USERNAME: ${{ secrets.ORG_NETFLIXOSS_USERNAME }} | ||
| NETFLIX_OSS_REPO_PASSWORD: ${{ secrets.ORG_NETFLIXOSS_PASSWORD }} |
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,56 +1,21 @@ | ||
| buildscript { | ||
| repositories { | ||
| jcenter() | ||
| } | ||
| dependencies { | ||
| classpath 'com.netflix.nebula:gradle-extra-configurations-plugin:3.0.3' | ||
| } | ||
| } | ||
|
|
||
| plugins { | ||
| id 'nebula.netflixoss' version '3.4.0' | ||
| id 'me.champeau.gradle.jmh' version '0.3.1' | ||
| id 'net.saliman.cobertura' version '2.2.8' | ||
| } | ||
|
|
||
| ext { | ||
| githubProjectName = rootProject.name | ||
| id "com.netflix.nebula.netflixoss" version "11.3.1" | ||
| id "me.champeau.jmh" version "0.7.1" | ||
| } | ||
|
|
||
| allprojects { | ||
| repositories { | ||
| jcenter() | ||
| mavenCentral() | ||
| } | ||
|
|
||
| apply plugin: 'net.saliman.cobertura' | ||
| } | ||
|
|
||
| subprojects { | ||
| apply plugin: 'nebula.netflixoss' | ||
| apply plugin: 'java' | ||
| apply plugin: 'nebula.provided-base' | ||
| apply plugin: 'nebula.compile-api' | ||
|
|
||
| sourceCompatibility = 1.6 | ||
| targetCompatibility = 1.6 | ||
|
|
||
| apply plugin: 'java-library' | ||
|
|
||
| group = "com.netflix.hystrix" | ||
|
|
||
| group = "com.netflix.${githubProjectName}" | ||
|
|
||
| eclipse { | ||
| classpath { | ||
| // include 'provided' dependencies on the classpath | ||
| plusConfigurations += [configurations.provided] | ||
| downloadSources = true | ||
| downloadJavadoc = true | ||
| } | ||
| } | ||
|
|
||
| idea { | ||
| module { | ||
| // include 'provided' dependencies on the classpath | ||
| scopes.COMPILE.plus += [configurations.provided] | ||
| } | ||
| tasks.withType(Javadoc).configureEach { | ||
| failOnError = false | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
8 changes: 4 additions & 4 deletions
8
hystrix-contrib/hystrix-codahale-metrics-publisher/build.gradle
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,6 +1,6 @@ | ||
| dependencies { | ||
| compileApi project(':hystrix-core') | ||
| compileApi 'io.dropwizard.metrics:metrics-core:3.2.2' | ||
| testCompile 'junit:junit-dep:4.10' | ||
| testCompile 'org.mockito:mockito-all:1.9.5' | ||
| api project(':hystrix-core') | ||
| api 'io.dropwizard.metrics:metrics-core:3.2.2' | ||
| testImplementation 'junit:junit-dep:4.10' | ||
| testImplementation 'org.mockito:mockito-all:1.9.5' | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,4 @@ | ||
| dependencies { | ||
| compileApi project(':hystrix-core') | ||
| compileApi "junit:junit:4.11" | ||
| api project(':hystrix-core') | ||
| api "junit:junit:4.11" | ||
| } |
Oops, something went wrong.