Fix Android build config

Author: stringfromjava

android/build.gradle

@@ -1,22 +1,21 @@
-
 buildscript {
   repositories {
     mavenCentral()
     google()
   }
 }
 apply plugin: 'com.android.application'
-apply plugin: 'kotlin-android'
+
 
 android {
   namespace "me.stringfromjava.funkin"
   compileSdk 35
   sourceSets {
     main {
       manifest.srcFile 'AndroidManifest.xml'
-      java.setSrcDirs(['src/main/java', 'src/main/kotlin'])
-      aidl.setSrcDirs(['src/main/java', 'src/main/kotlin'])
-      renderscript.setSrcDirs(['src/main/java', 'src/main/kotlin'])
+      java.setSrcDirs(['src/main/java'])
+      aidl.setSrcDirs(['src/main/java'])
+      renderscript.setSrcDirs(['src/main/java'])
       res.setSrcDirs(['res'])
       assets.setSrcDirs(['../assets'])
       jniLibs.setSrcDirs(['libs'])
@@ -48,9 +47,6 @@ android {
       proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
     }
   }
-
-  kotlin.compilerOptions.jvmTarget.set(org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_21)
-  
 }
 
 repositories {

android/src/main/java/me/stringfromjava/funkin/android/AndroidLauncher.java

@@ -4,7 +4,7 @@
 
 import com.badlogic.gdx.backends.android.AndroidApplication;
 import com.badlogic.gdx.backends.android.AndroidApplicationConfiguration;
-import me.stringfromjava.funkin.Main;
+import me.stringfromjava.funkin.FunkinGame;
 
 /** Launches the Android application. */
 public class AndroidLauncher extends AndroidApplication {
@@ -13,6 +13,6 @@ protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         AndroidApplicationConfiguration configuration = new AndroidApplicationConfiguration();
         configuration.useImmersiveMode = true; // Recommended, but not required.
-        initialize(new Main(), configuration);
+        initialize(new FunkinGame(), configuration);
     }
 }

build.gradle

@@ -10,7 +10,6 @@ buildscript {
   }
   dependencies {
     classpath "com.android.tools.build:gradle:8.7.3"
-    classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion"
 
   }
 }
@@ -30,7 +29,6 @@ allprojects {
 
 configure(subprojects - project(':android')) {
   apply plugin: 'java-library'
-  apply plugin: 'kotlin'
   sourceCompatibility = 17
 
   // From https://lyze.dev/2021/04/29/libGDX-Internal-Assets-List/
@@ -56,9 +54,6 @@ configure(subprojects - project(':android')) {
   compileJava {
     options.incremental = true
   }
-  compileKotlin.compilerOptions.jvmTarget.set(org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_17)
-  compileTestKotlin.compilerOptions.jvmTarget.set(org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_17)
-
 }
 
 subprojects {

core/build.gradle

@@ -7,8 +7,8 @@ dependencies {
   api "com.github.tommyettinger:anim8-gdx:$anim8Version"
   api "com.github.tommyettinger:libgdx-utils:$utilsVersion"
   api "io.github.libktx:ktx-freetype:$ktxVersion"
-  api "org.jetbrains.kotlin:kotlin-stdlib:$kotlinVersion"
   api "org.mini2Dx:universal-tween-engine:$universalTweenVersion"
+
   implementation "org.luaj:luaj-jse:3.0.1"
 
   if(enableGraalNative == 'true') {

core/src/main/java/me/stringfromjava/funkin/FunkinGame.java

@@ -1,11 +1,11 @@
 package me.stringfromjava.funkin;
 
 import com.badlogic.gdx.Game;
-import com.badlogic.gdx.Gdx;
 import com.badlogic.gdx.audio.Sound;
 import me.stringfromjava.funkin.backend.display.cache.TextureCache;
 import me.stringfromjava.funkin.game.InitScreen;
-import me.stringfromjava.funkin.tween.FunkinTween;
+
+import java.util.Set;
 
 /**
  * An enhanced version of libGDX's {@link Game} object.
@@ -54,7 +54,7 @@ public void dispose() {
             Funkin.music.dispose();
         }
 
-        var soundPoolKeys = Funkin.soundPool.keySet();
+        Set<Long> soundPoolKeys = Funkin.soundPool.keySet();
         for (long key : soundPoolKeys) {
             Sound sound = Funkin.soundPool.get(key);
             if (sound == null) {

gradle.properties

@@ -11,7 +11,6 @@ org.gradle.configureondemand=false
 # You could instead change 'quiet' below to 'info' to see info that's important mainly while debugging build files.
 # Documented at: https://docs.gradle.org/current/userguide/command_line_interface.html#sec:command_line_logging
 org.gradle.logging.level=quiet
-kotlinVersion=2.1.21
 anim8Version=0.5.3
 ktxVersion=1.13.1-rc1
 utilsVersion=0.13.7
@@ -21,4 +20,4 @@ android.useAndroidX=true
 android.enableR8.fullMode=false
 enableGraalNative=false
 gdxVersion=1.13.1
-projectVersion=0.1.0-demo
+projectVersion=1.0.0-ALPHA

lwjgl3/build.gradle

@@ -1,4 +1,3 @@
-
 buildscript {
   repositories {
     gradlePluginPortal()
@@ -14,7 +13,6 @@ plugins {
   id "application"
 }
 apply plugin: 'io.github.fourlastor.construo'
-apply plugin: 'org.jetbrains.kotlin.jvm'
 
 
 import io.github.fourlastor.construo.Target
@@ -28,7 +26,6 @@ java.targetCompatibility = 17
 if (JavaVersion.current().isJava9Compatible()) {
         compileJava.options.release.set(17)
 }
-kotlin.compilerOptions.jvmTarget.set(org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_17)
 
 dependencies {
   implementation "com.badlogicgames.gdx:gdx-backend-lwjgl3:$gdxVersion"
@@ -38,7 +35,8 @@ dependencies {
 
   if(enableGraalNative == 'true') {
     implementation "io.github.berstanio:gdx-svmhelper-backend-lwjgl3:$graalHelperVersion"
-  }
+
+    }
 }
 
 def os = System.properties['os.name'].toLowerCase()
@@ -133,15 +131,15 @@ construo {
         architecture.set(Target.Architecture.AARCH64)
         jdkUrl.set("https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.15%2B6/OpenJDK17U-jdk_aarch64_mac_hotspot_17.0.15_6.tar.gz")
         // macOS needs an identifier
-        identifier.set("me.stringfromjava.funkinjava." + appName)
+        identifier.set("me.stringfromjava.funkin." + appName)
         // Optional: icon for macOS, as an ICNS file
         macIcon.set(project.file("icons/logo.icns"))
       }
       register("macX64", Target.MacOs) {
         architecture.set(Target.Architecture.X86_64)
         jdkUrl.set("https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.15%2B6/OpenJDK17U-jdk_x64_mac_hotspot_17.0.15_6.tar.gz")
         // macOS needs an identifier
-        identifier.set("me.stringfromjava.funkinjava." + appName)
+        identifier.set("me.stringfromjava.funkin." + appName)
         // Optional: icon for macOS, as an ICNS file
         macIcon.set(project.file("icons/logo.icns"))
       }