Skip to content

Commit

Permalink
Merge pull request #87 from jakzal/bump-java-minimum
Browse files Browse the repository at this point in the history
Switch to Java 11
  • Loading branch information
jakzal authored Apr 5, 2023
2 parents 11dc95f + e272a2f commit 619337b
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 7 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,10 +35,10 @@ jobs:
sed -i'' -e "/^version=/s/=.*/=$BUILD_VERSION/" gradle.properties
echo $BUILD_VERSION
echo "BUILD_VERSION=$BUILD_VERSION" >> $GITHUB_ENV
- name: Set up JDK 1.8
- name: Set up JDK 11
uses: actions/setup-java@v3
with:
java-version: 8
java-version: 11
distribution: 'zulu'
- name: Configure gradle ${{ matrix.gradle-version }}
run: sed -i.bkp -e 's/\(distributionUrl=.*gradle\)-[0-9]*\.[0-9]*\(\.[0-9]*\)\{0,1\}\(.*\)/\1-${{ matrix.gradle-version }}\3/' gradle/wrapper/gradle-wrapper.properties
Expand Down
10 changes: 5 additions & 5 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -10,17 +10,17 @@ plugins {

group = "pl.zalas"

java.sourceCompatibility = JavaVersion.VERSION_1_8
java.targetCompatibility = JavaVersion.VERSION_1_8
java.sourceCompatibility = JavaVersion.VERSION_11
java.targetCompatibility = JavaVersion.VERSION_11

tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile> {
kotlinOptions.jvmTarget = "1.8"
kotlinOptions.jvmTarget = "11"
}

idea {
project {
jdkName = "1.8"
languageLevel = IdeaLanguageLevel("1.8")
jdkName = "11"
languageLevel = IdeaLanguageLevel("11")
}
}

Expand Down

0 comments on commit 619337b

Please sign in to comment.