diff --git a/.github/workflows/main-ci.yml b/.github/workflows/main-ci.yml index c1103486c..3c5793c2d 100644 --- a/.github/workflows/main-ci.yml +++ b/.github/workflows/main-ci.yml @@ -12,7 +12,6 @@ jobs: - name: Checkout submodules run: git submodule update --init --recursive - - name: Set up Java 8 uses: actions/setup-java@v1 with: diff --git a/build.gradle b/build.gradle index 45c98ce0d..4b9b75b38 100644 --- a/build.gradle +++ b/build.gradle @@ -5,8 +5,12 @@ plugins { id "com.github.hierynomus.license" version "0.15.0" } -sourceCompatibility = JavaVersion.VERSION_1_8 -targetCompatibility = JavaVersion.VERSION_1_8 +java { + toolchain { + languageVersion = JavaLanguageVersion.of(8) + vendor = JvmVendorSpec.ADOPTOPENJDK + } +} version = mod_version diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 549d84424..7665b0fa9 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.9-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-6.9-all.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/settings.gradle b/settings.gradle index c6f6a1f6b..0c9dcc7ba 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,6 +1,5 @@ pluginManagement { repositories { - jcenter() maven { name = 'Fabric' url = 'https://maven.fabricmc.net/'