Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove .ios from iOS backends packages #214

Merged
merged 1 commit into from
Dec 29, 2024
Merged

Remove .ios from iOS backends packages #214

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/main/kotlin/gdx/liftoff/data/platforms/IOS.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ class IOS : Platform {
fileName = "robovm.properties",
content = """app.version=${project.advanced.version.replace("[^0-9\\.]", "")}
app.id=${project.basic.rootPackage}
app.mainclass=${project.basic.rootPackage}.ios.IOSLauncher
app.mainclass=${project.basic.rootPackage}.IOSLauncher
app.executable=IOSLauncher
app.build=1
app.name=${project.basic.name}"""
Expand Down Expand Up @@ -213,7 +213,7 @@ apply plugin: 'robovm'
[compileJava, compileTestJava]*.options*.encoding = 'UTF-8'

ext {
mainClassName = "${project.basic.rootPackage}.ios.IOSLauncher"
mainClassName = "${project.basic.rootPackage}.IOSLauncher"
}

launchIPhoneSimulator.dependsOn build
Expand Down
2 changes: 1 addition & 1 deletion src/main/kotlin/gdx/liftoff/data/templates/KotlinTemplate.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -260,7 +260,7 @@ class StartupHelper private constructor() {

override fun getIOSLauncherContent(project: Project): String = """@file:JvmName("IOSLauncher")

package ${project.basic.rootPackage}.ios
package ${project.basic.rootPackage}

import org.robovm.apple.foundation.NSAutoreleasePool
import org.robovm.apple.uikit.UIApplication
Expand Down
8 changes: 4 additions & 4 deletions src/main/kotlin/gdx/liftoff/data/templates/Template.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -273,13 +273,13 @@ public class HeadlessLauncher {
addSourceFile(
project = project,
platform = IOS.ID,
packageName = "${project.basic.rootPackage}.ios",
packageName = project.basic.rootPackage,
fileName = "IOSLauncher.$launcherExtension",
content = getIOSLauncherContent(project)
)
}

fun getIOSLauncherContent(project: Project): String = """package ${project.basic.rootPackage}.ios;
fun getIOSLauncherContent(project: Project): String = """package ${project.basic.rootPackage};

import org.robovm.apple.foundation.NSAutoreleasePool;
import org.robovm.apple.uikit.UIApplication;
Expand Down Expand Up @@ -307,13 +307,13 @@ public class IOSLauncher extends IOSApplication.Delegate {
addSourceFile(
project = project,
platform = IOSMOE.ID,
packageName = "${project.basic.rootPackage}.ios",
packageName = project.basic.rootPackage,
fileName = "IOSLauncher.$launcherExtension",
content = getIOSMOELauncherContent(project)
)
}

fun getIOSMOELauncherContent(project: Project): String = """package ${project.basic.rootPackage}.ios;
fun getIOSMOELauncherContent(project: Project): String = """package ${project.basic.rootPackage};

import apple.uikit.c.UIKit;
import com.badlogic.gdx.backends.iosmoe.IOSApplication;
Expand Down
2 changes: 1 addition & 1 deletion src/main/kotlin/gdx/liftoff/data/templates/unofficial/AutumnMvcBasicTemplate.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -219,7 +219,7 @@ public class HeadlessLauncher {
}
}"""

override fun getIOSLauncherContent(project: Project): String = """package ${project.basic.rootPackage}.ios;
override fun getIOSLauncherContent(project: Project): String = """package ${project.basic.rootPackage};

import org.robovm.apple.foundation.NSAutoreleasePool;
import org.robovm.apple.uikit.UIApplication;
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/generator/ios-moe/xcode/ios-moe/Info.plist
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<key>LSRequiresIPhoneOS</key>
<true/>
<key>MOE.Main.Class</key>
<string>%PACKAGE%.ios.IOSLauncher</string>
<string>%PACKAGE%.IOSLauncher</string>
<key>UIApplicationExitsOnSuspend</key>
<false/>
<key>UIRequiredDeviceCapabilities</key>
Expand Down
Loading