Skip to content

Commit

Permalink
Merge pull request #10 from GTNewHorizons/update-kt
Browse files Browse the repository at this point in the history
Update to kotlin 1.9.24
  • Loading branch information
Dream-Master authored May 12, 2024
2 parents 59c56d9 + 6aa1c06 commit 4afad61
Show file tree
Hide file tree
Showing 7 changed files with 13 additions and 15 deletions.
1 change: 0 additions & 1 deletion addon.gradle

This file was deleted.

5 changes: 0 additions & 5 deletions build.gradle

This file was deleted.

4 changes: 4 additions & 0 deletions build.gradle.kts
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
plugins {
id("com.gtnewhorizons.gtnhconvention")
id("org.jetbrains.kotlin.jvm")
}
12 changes: 6 additions & 6 deletions dependencies.gradle
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
// Add your dependencies here

dependencies {
shadowImplementation("org.jetbrains.kotlin:kotlin-stdlib:1.8.0")
shadowImplementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.0")
shadowImplementation("org.jetbrains.kotlin:kotlin-reflect:1.8.0")
shadowImplementation("org.jetbrains:annotations")
shadowImplementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.4")
shadowImplementation("org.jetbrains.kotlinx:kotlinx-coroutines-jdk8:1.6.4")
shadowImplementation("org.jetbrains.kotlin:kotlin-stdlib:1.9.24")
shadowImplementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.9.24")
shadowImplementation("org.jetbrains.kotlin:kotlin-reflect:1.9.24")
shadowImplementation("org.jetbrains:annotations:24.1.0")
shadowImplementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.8.1")
shadowImplementation("org.jetbrains.kotlinx:kotlinx-coroutines-jdk8:1.8.1")
}
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ minimizeShadowedDependencies = false
# If disabled, won't rename the shadowed classes.
relocateShadowedDependencies = false

# Adds the GTNH maven, CurseMaven, IC2/Player maven, and some more well-known 1.7.10 repositories.
# Adds the GTNH maven, CurseMaven, Modrinth, and some more well-known 1.7.10 repositories.
includeWellKnownRepositories = true

# Change these to your Maven coordinates if you want to publish to a custom Maven repository instead of the default GTNH Maven.
Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Expand Down
2 changes: 1 addition & 1 deletion settings.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ pluginManagement {
}

plugins {
id 'com.gtnewhorizons.gtnhsettingsconvention' version '1.0.14'
id 'com.gtnewhorizons.gtnhsettingsconvention' version '1.0.22'
}


0 comments on commit 4afad61

Please sign in to comment.