all ci branches, update gradle, downgrade via

This commit is contained in:
creeper123123321 2021-02-24 08:37:55 -03:00
parent 4152225fc1
commit e63f7eb96d
3 changed files with 15 additions and 16 deletions

View File

@ -3,11 +3,7 @@
name: Java CI with Gradle name: Java CI with Gradle
on: on: [push, pull_request]
push:
branches: [ master ]
pull_request:
branches: [ master ]
jobs: jobs:
build: build:

View File

@ -1,4 +1,7 @@
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
plugins { plugins {
`java-library`
id("com.github.johnrengelman.shadow") version "6.1.0" id("com.github.johnrengelman.shadow") version "6.1.0"
id("com.github.ben-manes.versions") version "0.36.0" id("com.github.ben-manes.versions") version "0.36.0"
id("com.palantir.git-version") version "0.12.3" id("com.palantir.git-version") version "0.12.3"
@ -13,10 +16,15 @@ application {
} }
java { java {
sourceCompatibility = JavaVersion.VERSION_11 toolchain {
targetCompatibility = JavaVersion.VERSION_11 languageVersion.set(JavaLanguageVersion.of(11))
}
withSourcesJar()
} }
val compileKotlin: KotlinCompile by tasks
compileKotlin.kotlinOptions.jvmTarget = "11"
val gitVersion: groovy.lang.Closure<String> by extra val gitVersion: groovy.lang.Closure<String> by extra
group = "com.github.creeper123123321.viaaas" group = "com.github.creeper123123321.viaaas"
@ -36,9 +44,9 @@ repositories {
} }
dependencies { dependencies {
implementation("us.myles:viaversion:3.3.0-21w07a") { isTransitive = false } implementation("us.myles:viaversion:3.2.1") { isTransitive = false }
implementation("nl.matsv:viabackwards-all:3.3.0-21w07a") { isTransitive = false } implementation("nl.matsv:viabackwards-all:3.2.0") { isTransitive = false }
implementation("de.gerrygames:viarewind-all:1.5.4-SNAPSHOT") { isTransitive = false } implementation("de.gerrygames:viarewind-all:1.5.3") { isTransitive = false }
implementation("io.netty:netty-all:4.1.58.Final") implementation("io.netty:netty-all:4.1.58.Final")
implementation("org.yaml:snakeyaml:1.26") implementation("org.yaml:snakeyaml:1.26")
implementation("com.google.guava:guava:30.0-jre") implementation("com.google.guava:guava:30.0-jre")
@ -70,8 +78,6 @@ val run: JavaExec by tasks
run.standardInput = System.`in` run.standardInput = System.`in`
project.configurations.implementation.get().isCanBeResolved = true project.configurations.implementation.get().isCanBeResolved = true
tasks { tasks {
named<com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar>("shadowJar") { named<com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar>("shadowJar") {
configurations = listOf(project.configurations.implementation.get()) configurations = listOf(project.configurations.implementation.get())
@ -91,9 +97,6 @@ tasks.named<ProcessResources>("processResources") {
} }
} }
val compileKotlin: org.jetbrains.kotlin.gradle.tasks.KotlinCompile by tasks
compileKotlin.kotlinOptions.jvmTarget = "11"
publishing { publishing {
publications { publications {
create<MavenPublication>("maven") { create<MavenPublication>("maven") {

View File

@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.2-bin.zip distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.3-bin.zip
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists zipStorePath=wrapper/dists