Skip to content

Commit

Permalink
Merge pull request #74 from magneticflux-/develop
Browse files Browse the repository at this point in the history
Cut new release
  • Loading branch information
magneticflux- committed Aug 1, 2021
2 parents 7f5bf9d + bc6bbb7 commit 3763a96
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 14 deletions.
16 changes: 8 additions & 8 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,12 @@ plugins {
java
idea
`maven-publish`
id("fabric-loom") version "0.8-SNAPSHOT"
id("fabric-loom") version "0.9-SNAPSHOT"
id("com.github.ben-manes.versions") version "0.39.0"
id("com.matthewprenger.cursegradle") version "1.4.0"
id("com.diffplug.spotless") version "5.14.0"
kotlin("jvm") version "1.5.10"
kotlin("plugin.serialization") version "1.5.10"
kotlin("jvm") version "1.5.21"
kotlin("plugin.serialization") version "1.5.21"
id("org.shipkit.shipkit-auto-version") version "1.+"
id("org.shipkit.shipkit-changelog") version "1.+"
id("org.shipkit.shipkit-github-release") version "1.+"
Expand Down Expand Up @@ -68,7 +68,7 @@ base {
group = maven_group
}

minecraft {
loom {
}

dependencies {
Expand Down Expand Up @@ -103,8 +103,8 @@ dependencies {

include("com.skaggsm:java-mumble-link:0.2.6")
implementation("com.skaggsm:java-mumble-link:0.2.6")
include("com.skaggsm:jvm-shared-memory:0.2.7")
implementation("com.skaggsm:jvm-shared-memory:0.2.7")
include("com.skaggsm:jvm-shared-memory:0.2.9")
implementation("com.skaggsm:jvm-shared-memory:0.2.9")
}

tasks.processResources {
Expand Down Expand Up @@ -224,10 +224,10 @@ curseforge {

spotless {
kotlin {
ktlint("0.41.0")
ktlint("0.42.0")
}
kotlinGradle {
ktlint("0.41.0")
ktlint("0.42.0")
}
}

Expand Down
10 changes: 5 additions & 5 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -5,19 +5,19 @@ kotlin.code.style=official
org.gradle.jvmargs=-Xmx1G
# Fabric Properties
# check these on https://fabricmc.net/use
minecraft_version=1.17
yarn_mappings=1.17+build.13
minecraft_version=1.17.1
yarn_mappings=1.17.1+build.31
loader_version=0.11.6
# Mod Properties
maven_group=com.skaggsm
archives_base_name=fabric-mumblelink-mod
curseforge_id=321669
# Dependencies
fabric_version=0.36.0+1.17
kotlin_version=1.6.1+kotlin.1.5.10
fabric_version=0.37.1+1.17
kotlin_version=1.6.3+kotlin.1.5.21
cloth_config_version=5.0.34
fiber_2_cloth_version=3.2.0
fiber_version=0.23.0-2
modmenu_version=2.0.2
modmenu_version=2.0.4
# Don't include the standard library, it's already bundled with fabric-language-kotlin
kotlin.stdlib.default.dependency=false
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-7.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-7.1.1-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists

0 comments on commit 3763a96

Please sign in to comment.