Skip to content

Commit

Permalink
chore: upgrade dependencies + CI jdk
Browse files Browse the repository at this point in the history
  • Loading branch information
Cubxity committed Jul 8, 2021
1 parent e742a6a commit 54cf853
Show file tree
Hide file tree
Showing 6 changed files with 36 additions and 13 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/preview.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,11 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v1
- name: Set up JDK 1.8
- name: Set up JDK 16
uses: actions/setup-java@v1
with:
java-package: jdk
java-version: 1.8
java-version: 16
distribution: adopt
- name: Grant execute permission for gradlew
run: chmod +x gradlew
- name: Build with Gradle
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,11 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v1
- name: Set up JDK 1.8
- name: Set up JDK 16
uses: actions/setup-java@v1
with:
java-package: jdk
java-version: 1.8
java-version: 16
distribution: adopt
- name: Grant execute permission for gradlew
run: chmod +x gradlew
- name: Build with Gradle
Expand Down
6 changes: 3 additions & 3 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile

plugins {
kotlin("jvm") version "1.5.10" apply false
kotlin("kapt") version "1.5.10" apply false
id("org.jetbrains.kotlin.plugin.serialization") version "1.5.0" apply false
kotlin("jvm") version "1.5.20" apply false
kotlin("kapt") version "1.5.20" apply false
id("org.jetbrains.kotlin.plugin.serialization") version "1.5.20" apply false
id("com.github.johnrengelman.shadow") version "7.0.0" apply false
id("net.kyori.blossom") version "1.3.0" apply false
}
Expand Down
7 changes: 5 additions & 2 deletions bukkit/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -21,15 +21,18 @@ plugins {
}

repositories {
maven("https://papermc.io/repo/repository/maven-public")
maven("https://papermc.io/repo/repository/maven-public/")
}

dependencies {
api(project(":unifiedmetrics-core"))
compileOnly("com.destroystokyo.paper", "paper-api", "1.16.5-R0.1-SNAPSHOT")
compileOnly("io.papermc.paper", "paper-api", "1.17.1-R0.1-SNAPSHOT")
}

tasks {
compileKotlin {
kotlinOptions.jvmTarget = "16"
}
shadowJar {
archiveClassifier.set("")
}
Expand Down
20 changes: 20 additions & 0 deletions gradle.properties
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
#
# UnifiedMetrics is a fully-featured metrics collection plugin for Minecraft servers.
# Copyright (C) 2021 Cubxity
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as published
# by the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU Affero General Public License for more details.
#
# You should have received a copy of the GNU Affero General Public License
# along with this program. If not, see <https://www.gnu.org/licenses/>.
#

# Workaround for https://youtrack.jetbrains.com/issue/KT-45545
org.gradle.jvmargs=--illegal-access=permit
4 changes: 2 additions & 2 deletions velocity/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@ repositories {
dependencies {
api(project(":unifiedmetrics-core"))

compileOnly("com.velocitypowered:velocity-api:1.1.8")
kapt("com.velocitypowered:velocity-api:1.1.8")
compileOnly("com.velocitypowered:velocity-api:3.0.0")
kapt("com.velocitypowered:velocity-api:3.0.0")
}

tasks {
Expand Down

0 comments on commit 54cf853

Please sign in to comment.