Skip to content

Commit

Permalink
Update to Gradle 7.2 (#3572)
Browse files Browse the repository at this point in the history
* Update to Gradle 7.2

* Only block properties we use in security manager instead of all of them.
  • Loading branch information
Anuraag Agrawal authored Sep 2, 2021
1 parent e8f0546 commit 29cc44e
Show file tree
Hide file tree
Showing 8 changed files with 183 additions and 116 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/main-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,14 @@ jobs:
matrix:
os:
- macos-latest
- ubuntu-18.04
- ubuntu-20.04
test-java-version:
- 8
- 11
- 16
- 17
include:
- os: ubuntu-18.04
- os: ubuntu-20.04
test-java-version: 11
coverage: true
steps:
Expand Down Expand Up @@ -73,7 +73,7 @@ jobs:
name: Publish snapshots
if: ${{ github.event_name == 'push' && github.repository == 'open-telemetry/opentelemetry-java' }}
needs: build
runs-on: ubuntu-18.04
runs-on: ubuntu-20.04
steps:
- uses: actions/[email protected]
with:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/patch-release-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ on:

jobs:
prepare-release-branch:
runs-on: ubuntu-18.04
runs-on: ubuntu-20.04
outputs:
release-branch-name: ${{ steps.parse-release-branch.outputs.release-branch-name }}
steps:
Expand Down Expand Up @@ -42,7 +42,7 @@ jobs:
git checkout -b ${{ steps.parse-release-branch.outputs.release-branch-name }}
git push --set-upstream origin ${{ steps.parse-release-branch.outputs.release-branch-name }}
build:
runs-on: ubuntu-18.04
runs-on: ubuntu-20.04
needs: prepare-release-branch
steps:
- name: Checkout release branch
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/pr-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,14 @@ jobs:
matrix:
os:
- macos-latest
- ubuntu-18.04
- ubuntu-20.04
test-java-version:
- 8
- 11
- 16
- 17
include:
- os: ubuntu-18.04
- os: ubuntu-20.04
test-java-version: 11
coverage: true
steps:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pr-examples-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
matrix:
os:
- macos-latest
- ubuntu-18.04
- ubuntu-20.04
steps:
- uses: actions/[email protected]
- id: setup-java-11
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ on:
jobs:
build:
name: Build and release
runs-on: ubuntu-18.04
runs-on: ubuntu-20.04
steps:
- uses: actions/[email protected]
- uses: actions/setup-java@v2
Expand Down
4 changes: 2 additions & 2 deletions gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.1-bin.zip
distributionSha256Sum=2debee19271e1b82c6e41137d78e44e6e841035230a1a169ca47fd3fb09ed87b
distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionSha256Sum=f581709a9c35e9cb92e16f585d2c4bc99b2b1a5f85d2badbd3dc6bff59e1e6dd
Loading

0 comments on commit 29cc44e

Please sign in to comment.