Merge pull request #90147 from melquiadess/remove-redundant-semicolons
Android: Remove redundant semicolons from Kotlin/gradle files
This commit is contained in:
commit
82dd9b9916
|
@ -194,17 +194,17 @@ final String VALUE_SEPARATOR_REGEX = "\\|"
|
|||
|
||||
// get the list of ABIs the project should be exported to
|
||||
ext.getExportEnabledABIs = { ->
|
||||
String enabledABIs = project.hasProperty("export_enabled_abis") ? project.property("export_enabled_abis") : "";
|
||||
String enabledABIs = project.hasProperty("export_enabled_abis") ? project.property("export_enabled_abis") : ""
|
||||
if (enabledABIs == null || enabledABIs.isEmpty()) {
|
||||
enabledABIs = "armeabi-v7a|arm64-v8a|x86|x86_64|"
|
||||
}
|
||||
Set<String> exportAbiFilter = [];
|
||||
Set<String> exportAbiFilter = []
|
||||
for (String abi_name : enabledABIs.split(VALUE_SEPARATOR_REGEX)) {
|
||||
if (!abi_name.trim().isEmpty()){
|
||||
exportAbiFilter.add(abi_name);
|
||||
exportAbiFilter.add(abi_name)
|
||||
}
|
||||
}
|
||||
return exportAbiFilter;
|
||||
return exportAbiFilter
|
||||
}
|
||||
|
||||
ext.getExportPath = {
|
||||
|
|
|
@ -20,7 +20,7 @@ ext {
|
|||
String versionStatus = System.getenv("GODOT_VERSION_STATUS")
|
||||
if (versionStatus != null && !versionStatus.isEmpty()) {
|
||||
try {
|
||||
buildNumber = Integer.parseInt(versionStatus.replaceAll("[^0-9]", ""));
|
||||
buildNumber = Integer.parseInt(versionStatus.replaceAll("[^0-9]", ""))
|
||||
} catch (NumberFormatException ignored) {
|
||||
buildNumber = 0
|
||||
}
|
||||
|
|
|
@ -127,7 +127,7 @@ open class GodotEditor : GodotActivity() {
|
|||
*/
|
||||
protected open fun checkForProjectPermissionsToEnable() {
|
||||
// Check for RECORD_AUDIO permission
|
||||
val audioInputEnabled = java.lang.Boolean.parseBoolean(GodotLib.getGlobal("audio/driver/enable_input"));
|
||||
val audioInputEnabled = java.lang.Boolean.parseBoolean(GodotLib.getGlobal("audio/driver/enable_input"))
|
||||
if (audioInputEnabled) {
|
||||
PermissionsUtil.requestPermission(Manifest.permission.RECORD_AUDIO, this)
|
||||
}
|
||||
|
|
|
@ -121,7 +121,7 @@ android {
|
|||
case "dev":
|
||||
default:
|
||||
sconsTarget += "_debug"
|
||||
break;
|
||||
break
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -152,7 +152,7 @@ class Godot(private val context: Context) : SensorEventListener {
|
|||
private var useApkExpansion = false
|
||||
private var useImmersive = false
|
||||
private var useDebugOpengl = false
|
||||
private var darkMode = false;
|
||||
private var darkMode = false
|
||||
|
||||
private var containerLayout: FrameLayout? = null
|
||||
var renderView: GodotRenderView? = null
|
||||
|
@ -292,7 +292,7 @@ class Godot(private val context: Context) : SensorEventListener {
|
|||
initializationStarted = false
|
||||
throw e
|
||||
} finally {
|
||||
endBenchmarkMeasure("Startup", "Godot::onCreate");
|
||||
endBenchmarkMeasure("Startup", "Godot::onCreate")
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -621,7 +621,7 @@ class Godot(private val context: Context) : SensorEventListener {
|
|||
// These properties are defined after Godot setup completion, so we retrieve them here.
|
||||
val longPressEnabled = java.lang.Boolean.parseBoolean(GodotLib.getGlobal("input_devices/pointing/android/enable_long_press_as_right_click"))
|
||||
val panScaleEnabled = java.lang.Boolean.parseBoolean(GodotLib.getGlobal("input_devices/pointing/android/enable_pan_and_scale_gestures"))
|
||||
val rotaryInputAxis = java.lang.Integer.parseInt(GodotLib.getGlobal("input_devices/pointing/android/rotary_input_scroll_axis"));
|
||||
val rotaryInputAxis = java.lang.Integer.parseInt(GodotLib.getGlobal("input_devices/pointing/android/rotary_input_scroll_axis"))
|
||||
|
||||
runOnUiThread {
|
||||
renderView?.inputHandler?.apply {
|
||||
|
|
|
@ -142,7 +142,7 @@ internal class VkThread(private val vkSurfaceView: VkSurfaceView, private val vk
|
|||
fun onSurfaceChanged(width: Int, height: Int) {
|
||||
lock.withLock {
|
||||
hasSurface = true
|
||||
surfaceChanged = true;
|
||||
surfaceChanged = true
|
||||
this.width = width
|
||||
this.height = height
|
||||
|
||||
|
@ -179,7 +179,7 @@ internal class VkThread(private val vkSurfaceView: VkSurfaceView, private val vk
|
|||
// blocking the thread lifecycle by holding onto the lock.
|
||||
if (eventQueue.isNotEmpty()) {
|
||||
event = eventQueue.removeAt(0)
|
||||
break;
|
||||
break
|
||||
}
|
||||
|
||||
if (readyToDraw) {
|
||||
|
@ -199,7 +199,7 @@ internal class VkThread(private val vkSurfaceView: VkSurfaceView, private val vk
|
|||
}
|
||||
|
||||
// Break out of the loop so drawing can occur without holding onto the lock.
|
||||
break;
|
||||
break
|
||||
} else if (rendererResumed) {
|
||||
// If we aren't ready to draw but are resumed, that means we either lost a surface
|
||||
// or the app was paused.
|
||||
|
|
Loading…
Reference in New Issue