From e63f7eb96d7ff2527dbd5f4b1d4548eb43bf1c26 Mon Sep 17 00:00:00 2001
From: creeper123123321 <7974274+creeper123123321@users.noreply.github.com>
Date: Wed, 24 Feb 2021 08:37:55 -0300
Subject: [PATCH] all ci branches, update gradle, downgrade via

---
 .github/workflows/gradle.yml             |  6 +-----
 build.gradle.kts                         | 23 +++++++++++++----------
 gradle/wrapper/gradle-wrapper.properties |  2 +-
 3 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml
index d756c06..62f401f 100644
--- a/.github/workflows/gradle.yml
+++ b/.github/workflows/gradle.yml
@@ -3,11 +3,7 @@
 
 name: Java CI with Gradle
 
-on:
-  push:
-    branches: [ master ]
-  pull_request:
-    branches: [ master ]
+on: [push, pull_request]
 
 jobs:
   build:
diff --git a/build.gradle.kts b/build.gradle.kts
index c48260c..9cc7467 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -1,4 +1,7 @@
+import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
+
 plugins {
+    `java-library`
     id("com.github.johnrengelman.shadow") version "6.1.0"
     id("com.github.ben-manes.versions") version "0.36.0"
     id("com.palantir.git-version") version "0.12.3"
@@ -13,10 +16,15 @@ application {
 }
 
 java {
-    sourceCompatibility = JavaVersion.VERSION_11
-    targetCompatibility = JavaVersion.VERSION_11
+    toolchain {
+        languageVersion.set(JavaLanguageVersion.of(11))
+    }
+    withSourcesJar()
 }
 
+val compileKotlin: KotlinCompile by tasks
+compileKotlin.kotlinOptions.jvmTarget = "11"
+
 val gitVersion: groovy.lang.Closure<String> by extra
 
 group = "com.github.creeper123123321.viaaas"
@@ -36,9 +44,9 @@ repositories {
 }
 
 dependencies {
-    implementation("us.myles:viaversion:3.3.0-21w07a") { isTransitive = false }
-    implementation("nl.matsv:viabackwards-all:3.3.0-21w07a") { isTransitive = false }
-    implementation("de.gerrygames:viarewind-all:1.5.4-SNAPSHOT") { isTransitive = false }
+    implementation("us.myles:viaversion:3.2.1") { isTransitive = false }
+    implementation("nl.matsv:viabackwards-all:3.2.0") { isTransitive = false }
+    implementation("de.gerrygames:viarewind-all:1.5.3") { isTransitive = false }
     implementation("io.netty:netty-all:4.1.58.Final")
     implementation("org.yaml:snakeyaml:1.26")
     implementation("com.google.guava:guava:30.0-jre")
@@ -70,8 +78,6 @@ val run: JavaExec by tasks
 run.standardInput = System.`in`
 
 project.configurations.implementation.get().isCanBeResolved = true
-
-
 tasks {
     named<com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar>("shadowJar") {
         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 {
     publications {
         create<MavenPublication>("maven") {
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 2a56324..442d913 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.8.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.3-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists