Skip to content

Commit

Permalink
Merge pull request AstechzGO#149 from ryanlarkin/major-update
Browse files Browse the repository at this point in the history
Update dependencies
  • Loading branch information
ryanlarkin authored Jan 11, 2022
2 parents 02a22e6 + c19196b commit 71a751d
Show file tree
Hide file tree
Showing 17 changed files with 461 additions and 319 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/snapshot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@ jobs:

steps:
- uses: actions/checkout@v2
- name: Set up JDK 11
- name: Set up JDK 17
uses: actions/setup-java@v1
with:
java-version: 11
java-version: 17
- name: Grant execute permission for gradlew
run: chmod +x gradlew
- name: Deploy with Gradle
Expand Down
2 changes: 0 additions & 2 deletions .idea/Luminescent.iml

This file was deleted.

25 changes: 25 additions & 0 deletions .idea/codeStyles/Project.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 5 additions & 0 deletions .idea/codeStyles/codeStyleConfig.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion .idea/compiler.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

65 changes: 65 additions & 0 deletions .idea/libraries-with-intellij-classes.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion .idea/misc.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Luminescent
To run in IntelliJ IDEA, the Java version that is used must be JDK 11+, and the Java and Gradle plugins installed
To run in IntelliJ IDEA, the Java version that is used must be JDK 17+, and the Java and Gradle plugins installed

[View and Download Latest Release](/../../releases/latest)

Expand Down
13 changes: 6 additions & 7 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ plugins {
}

buildscript {
extra["lwjglVersion"] = "3.2.3"
extra["jomlVersion"] = "1.9.24"
extra["gsonVersion"] = "2.8.6"
extra["lwjglVersion"] = "3.3.0"
extra["jomlVersion"] = "1.10.3"
extra["gsonVersion"] = "2.8.9"
}

repositories {
Expand Down Expand Up @@ -93,17 +93,16 @@ task("copyToRoot") {
task("run") {
doLast {
javaexec {
main="-jar"
args = listOf("Luminescent.jar")
}
}
}.dependsOn("deploy")

tasks.compileJava {
sourceCompatibility = "11"
targetCompatibility = "11"
sourceCompatibility = "17"
targetCompatibility = "17"
}

tasks.wrapper {
gradleVersion = "6.3"
gradleVersion = "7.3.3"
}
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-6.3-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
Loading

0 comments on commit 71a751d

Please sign in to comment.