Skip to content

Commit

Permalink
uncomment (#857)
Browse files Browse the repository at this point in the history
* uncomment

* copy from altrisi's
  • Loading branch information
gnembon authored May 12, 2021
1 parent f5db843 commit 15bba80
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 16 deletions.
8 changes: 3 additions & 5 deletions .github/workflows/build-on-pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,7 @@

name: Pull Request Builds

on:
pull_request:
paths:
- "src/**"
on: [pull_request]

jobs:
Build:
Expand All @@ -16,8 +13,9 @@ jobs:
steps:
- uses: actions/checkout@v2
- name: Set up JDK 16
uses: actions/setup-java@v1
uses: actions/setup-java@v2
with:
distribution: 'adopt'
java-version: 16
- name: Cache Gradle packages
uses: actions/cache@v2
Expand Down
8 changes: 3 additions & 5 deletions .github/workflows/devbuild.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,7 @@

name: Development Builds

on:
push:
paths:
- "src/**"
on: [push]

jobs:
Build:
Expand All @@ -16,8 +13,9 @@ jobs:
steps:
- uses: actions/checkout@v2
- name: Set up JDK 16
uses: actions/setup-java@v1
uses: actions/setup-java@v2
with:
distribution: 'adopt'
java-version: 16
- name: Cache Gradle packages
uses: actions/cache@v2
Expand Down
6 changes: 4 additions & 2 deletions .github/workflows/publish-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -66,8 +66,9 @@ jobs:
with:
ref: ${{ steps.getbranchinfo.outputs.branchname }}
- name: Set up JDK 16
uses: actions/setup-java@v1
uses: actions/setup-java@v2
with:
distribution: 'adopt'
java-version: 16
- name: Cache Gradle packages
uses: actions/cache@v2
Expand Down Expand Up @@ -140,8 +141,9 @@ jobs:
- name: Checkout Carpet sources
uses: actions/checkout@v2
- name: Set up JDK 16
uses: actions/setup-java@v1
uses: actions/setup-java@v2
with:
distribution: 'adopt'
java-version: 16
- name: Cache Gradle packages
uses: actions/cache@v2
Expand Down
8 changes: 4 additions & 4 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -55,10 +55,10 @@ tasks.withType(JavaCompile).configureEach {
// The Minecraft launcher currently installs Java 8 for users, so your mod probably wants to target Java 8 too
// JDK 9 introduced a new way of specifying this that will make sure no newer classes or methods are used.
// We'll use that if it's available, but otherwise we'll use the older option.
//def targetVersion = 8
//if (JavaVersion.current().isJava9Compatible()) {
// it.options.release = targetVersion
//}
def targetVersion = 8
if (JavaVersion.current().isJava9Compatible()) {
it.options.release = targetVersion
}

// Minecraft 1.17 (21w19a) upwards uses Java 16.
//it.options.release = 16
Expand Down

0 comments on commit 15bba80

Please sign in to comment.