Skip to content

Commit 4a37e45

Browse files
Updated promptsign, gradle, kotlin, bstats and shadow plugin/dependency
1 parent 272705c commit 4a37e45

6 files changed

Lines changed: 18 additions & 15 deletions

File tree

.gitignore

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
1-
# Created by .ignore support plugin (hsz.mobi)
2-
### SpongePlugins template
1+
### SpongePlugins3 template
32
.idea/
43
.gradle/
54
build/
65
run/
6+
*.jar
7+
!gradle-wrapper.jar
8+
*.iml

build.gradle

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,14 @@ buildscript {
55
}
66
}
77
dependencies {
8-
classpath "gradle.plugin.flavor.pie:promptsign:1.0.2"
8+
classpath "gradle.plugin.flavor.pie:promptsign:1.1.0"
99
}
1010
}
1111

1212
plugins {
13-
id "org.jetbrains.kotlin.jvm" version "1.2.50"
14-
id "org.jetbrains.kotlin.kapt" version "1.2.50"
15-
id "com.github.johnrengelman.shadow" version "2.0.4"
13+
id "org.jetbrains.kotlin.jvm" version "1.3.11"
14+
id "org.jetbrains.kotlin.kapt" version "1.3.11"
15+
id "com.github.johnrengelman.shadow" version "4.0.3"
1616
}
1717

1818
def isJitpack = System.getenv("JITPACK") != null
@@ -28,7 +28,7 @@ repositories {
2828
jcenter()
2929
maven { url "https://repo.spongepowered.org/maven/" }
3030
maven { url "https://jitpack.io" }
31-
maven { url "http://repo.bstats.org/content/repositories/releases" }
31+
maven { url "https://repo.codemc.org/repository/maven-public" }
3232
}
3333

3434
configurations {
@@ -37,10 +37,10 @@ configurations {
3737
}
3838

3939
dependencies {
40-
shadow "org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.2.50"
40+
shadow "org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.3.11"
4141
kapt "org.spongepowered:spongeapi:7.0.0"
4242
shadow("com.github.randombyte-developer.kosp:kosp:v2.2.3") { transitive = false }
43-
shadow "org.bstats:bstats-sponge:1.2"
43+
shadow "org.bstats:bstats-sponge:1.4"
4444
}
4545

4646
jar.enabled = false

gradle/wrapper/gradle-wrapper.jar

0 Bytes
Binary file not shown.
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
#Fri Jul 21 22:19:05 CEST 2017
1+
#Tue Dec 25 18:20:14 CET 2018
22
distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-bin.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.3-bin.zip

src/main/kotlin/de/randombyte/commandutils/CommandUtils.kt

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ import de.randombyte.commandutils.executeonserverstartup.ServerStartupListener
2020
import de.randombyte.commandutils.service.CommandUtilsService
2121
import de.randombyte.commandutils.service.CommandUtilsServiceImpl
2222
import de.randombyte.kosp.extensions.toText
23+
import org.bstats.sponge.Metrics2
2324
import org.slf4j.Logger
2425
import org.spongepowered.api.Sponge
2526
import org.spongepowered.api.command.args.GenericArguments.*
@@ -41,8 +42,8 @@ import java.nio.file.Path
4142
dependencies = [(Dependency(id = PLACEHOLDER_API_ID, optional = true))])
4243
class CommandUtils @Inject constructor(
4344
val logger: Logger,
44-
@ConfigDir(sharedRoot = false) configPath: Path
45-
//val bStats: Metrics
45+
@ConfigDir(sharedRoot = false) configPath: Path,
46+
val bStats: Metrics2
4647
) {
4748
companion object {
4849
const val ID = "command-utils"

src/main/kotlin/de/randombyte/commandutils/alias/AliasParser.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ object AliasParser {
1010
enum class SplitType { WORD, ARG, VAR_ARG }
1111

1212
fun parse(alias: String, command: String): Map<String, String>? {
13-
val aliasSplits = alias.split(delimiters = " ")
14-
val commandSplits = command.split(delimiters = " ", limit = aliasSplits.size)
13+
val aliasSplits = alias.split(" ")
14+
val commandSplits = command.split(" ", limit = aliasSplits.size)
1515

1616
if (commandSplits.size < aliasSplits.size) return null // command is to short for this alias
1717

0 commit comments

Comments
 (0)