Skip to content

Commit

Permalink
Updating java version (#623)
Browse files Browse the repository at this point in the history
* Updating java version

* Updating java version

* Updating java version

* Updating java

* updating java version
  • Loading branch information
cram-cfa authored Nov 26, 2024
1 parent aed422a commit ca3ee5a
Show file tree
Hide file tree
Showing 7 changed files with 12 additions and 12 deletions.
2 changes: 1 addition & 1 deletion .deepsource.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,4 @@ name = "test-coverage"
name = "java"

[analyzers.meta]
runtime_version = "17"
runtime_version = "21"
4 changes: 2 additions & 2 deletions .github/workflows/publish-snapshot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,10 @@ jobs:
- 5432:5432
steps:
- uses: actions/checkout@v4
- name: Set up JDK 17
- name: Set up JDK 21
uses: actions/setup-java@v4
with:
java-version: '17'
java-version: '21'
distribution: 'adopt'
server-id: github
settings-path: ${{ github.workspace }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ jobs:
uses: actions/setup-java@v4
with:
distribution: 'adopt'
java-version: '17'
java-version: '21'
cache: 'gradle'
- name: Cache Gradle packages
uses: actions/cache@v4
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/run-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ jobs:
uses: actions/setup-java@v4
with:
distribution: 'adopt'
java-version: '17'
java-version: '21'
cache: 'gradle'
- name: Cache Gradle packages
uses: actions/cache@v4
Expand Down
4 changes: 2 additions & 2 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ jacoco {
toolVersion = '0.8.10'
}

targetCompatibility = JavaVersion.VERSION_17
sourceCompatibility = JavaVersion.VERSION_17
targetCompatibility = JavaVersion.VERSION_21
sourceCompatibility = JavaVersion.VERSION_21

group = "org.codeforamerica.platform"
version = "1.4.6-SNAPSHOT"
Expand Down
2 changes: 1 addition & 1 deletion 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-8.1.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.11-bin.zip
networkTimeout=10000
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
8 changes: 4 additions & 4 deletions setup.sh
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ else
fi

echo 'Installing brew packages'
brew install --cask temurin@17
brew install --cask temurin@21
brew install jenv gradle postgresql@14

# Install jenv in either the .bashrc or zshrc, whichever is present
Expand All @@ -38,9 +38,9 @@ if [[ $(uname -m) == 'arm64' ]]; then
eval "$(jenv init -)"
fi

# Check if jenv can find java 17
if ! jenv versions | grep -q 17; then
jenv add /Library/Java/JavaVirtualMachines/temurin-17.jdk/Contents/Home
# Check if jenv can find java 21
if ! jenv versions | grep -q 21; then
jenv add /Library/Java/JavaVirtualMachines/temurin-21.jdk/Contents/Home
fi

# If the postgres service isn't running in brew, start it
Expand Down

0 comments on commit ca3ee5a

Please sign in to comment.