Gave up trying to have separate java and kotlin modules

This commit is contained in:
Auxilor
2022-02-02 15:57:37 +00:00
parent 9ad480ecf0
commit 30457c29a1
184 changed files with 33 additions and 55 deletions

View File

@@ -1,2 +0,0 @@
group 'com.willfp'
version rootProject.version

View File

@@ -1,31 +0,0 @@
buildscript {
repositories {
mavenCentral()
}
dependencies {
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.6.0"
}
}
apply plugin: "kotlin"
group 'com.willfp'
version rootProject.version
dependencies {
compileOnly project(":eco-api:api-java")
compileOnly 'org.jetbrains.kotlin:kotlin-stdlib:1.6.0'
}
compileKotlin {
kotlinOptions {
jvmTarget = "17"
}
targetCompatibility = JavaVersion.VERSION_17
sourceCompatibility = JavaVersion.VERSION_17
}
java {
withJavadocJar()
}

View File

@@ -1,32 +1,45 @@
subprojects {
group 'com.willfp'
version rootProject.version
buildscript {
repositories {
mavenCentral()
}
dependencies {
// Adventure
compileOnly 'net.kyori:adventure-platform-bukkit:4.0.0'
compileOnly 'net.kyori:adventure-text-minimessage:4.1.0-SNAPSHOT'
// Other
compileOnly 'org.spigotmc:spigot-api:1.17.1-R0.1-SNAPSHOT'
compileOnly 'org.apache.maven:maven-artifact:3.8.1'
compileOnly 'com.comphenix.protocol:ProtocolLib:4.6.1-SNAPSHOT'
compileOnly 'com.google.code.gson:gson:2.8.8'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.6.0"
}
}
java {
withJavadocJar()
apply plugin: 'kotlin'
dependencies {
// Kotlin
compileOnly 'org.jetbrains.kotlin:kotlin-stdlib:1.6.0'
// Adventure
compileOnly 'net.kyori:adventure-platform-bukkit:4.0.0'
compileOnly 'net.kyori:adventure-text-minimessage:4.1.0-SNAPSHOT'
// Other
compileOnly 'org.spigotmc:spigot-api:1.17.1-R0.1-SNAPSHOT'
compileOnly 'org.apache.maven:maven-artifact:3.8.1'
compileOnly 'com.comphenix.protocol:ProtocolLib:4.6.1-SNAPSHOT'
compileOnly 'com.google.code.gson:gson:2.8.8'
}
compileKotlin {
kotlinOptions {
jvmTarget = "17"
}
targetCompatibility = JavaVersion.VERSION_17
sourceCompatibility = JavaVersion.VERSION_17
}
java {
withJavadocJar()
}
group 'com.willfp'
version rootProject.version
dependencies {
api project(":eco-api:api-java")
api project(":eco-api:api-kotlin")
}
build.dependsOn publishToMavenLocal
publishing {

Some files were not shown because too many files have changed in this diff Show More