Attempt to fix -kt library compatibility

CypherCove · Aug 27, 2023 · c84c827 · c84c827
1 parent 03351f1
commit c84c827
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 19 deletions.
diff --git a/CHANGES.md b/CHANGES.md
@@ -1,3 +1,6 @@
+# 0.1.7
+* Attempt to fix -kt compatibility with Java compile version.
+
 # 0.1.6
 * Update -kt version's Kotlin version to 1.8.20
 * Update libGDX version to 1.12.0

diff --git a/build.gradle b/build.gradle
@@ -31,6 +31,19 @@ subprojects {
     }
 }
 
+publishing {
+    repositories {
+        maven {
+            name = "OSSRH"
+            url = "https://oss.sonatype.org/service/local/staging/deploy/maven2/"
+            credentials {
+                username = System.getenv("SONATYPE_USERNAME")
+                password = System.getenv("SONATYPE_PASSWORD")
+            }
+        }
+    }
+}
+
 configure(project.librarySubProjects) {
     apply plugin: "java-library"
 
@@ -82,17 +95,6 @@ configure(project.librarySubProjects) {
                 }
             }
         }
-
-        repositories {
-            maven {
-                name = "OSSRH"
-                url = "https://oss.sonatype.org/service/local/staging/deploy/maven2/"
-                credentials {
-                    username = System.getenv("SONATYPE_USERNAME")
-                    password = System.getenv("SONATYPE_PASSWORD")
-                }
-            }
-        }
     }
 
     signing {

diff --git a/gdxtween-kt/build.gradle b/gdxtween-kt/build.gradle
@@ -1,11 +1,12 @@
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
+
 plugins {
     id 'org.jetbrains.kotlin.jvm' version '1.8.20'
-    id 'java-library'
 }
 
 compileKotlin {
-    kotlinOptions {
-        jvmTarget = "1.8"
+    compilerOptions {
+        jvmTarget = JvmTarget.JVM_1_8
     }
 }
 

diff --git a/gdxtween/build.gradle b/gdxtween/build.gradle
@@ -1,10 +1,6 @@
-
-
 sourceCompatibility = 1.7
 targetCompatibility = 1.7
 
-//[compileJava, compileTestJava]*.options*.encoding = 'UTF-8'
-
 dependencies {
     testImplementation group: 'junit', name: 'junit', version: '4.12'
 }

diff --git a/gradle.properties b/gradle.properties
@@ -1,5 +1,5 @@
 libraryGroup=com.cyphercove.gdxtween
-libraryVersion=0.1.6
+libraryVersion=0.1.7
 
 gdxVersion=1.12.0