Skip to content

Commit 82dd9b9

Browse files
committed
Merge pull request godotengine#90147 from melquiadess/remove-redundant-semicolons
Android: Remove redundant semicolons from Kotlin/gradle files
2 parents c760635 + 73908bb commit 82dd9b9

File tree

6 files changed

+13
-13
lines changed

6 files changed

+13
-13
lines changed

platform/android/java/app/config.gradle

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -194,17 +194,17 @@ final String VALUE_SEPARATOR_REGEX = "\\|"
194194

195195
// get the list of ABIs the project should be exported to
196196
ext.getExportEnabledABIs = { ->
197-
String enabledABIs = project.hasProperty("export_enabled_abis") ? project.property("export_enabled_abis") : "";
197+
String enabledABIs = project.hasProperty("export_enabled_abis") ? project.property("export_enabled_abis") : ""
198198
if (enabledABIs == null || enabledABIs.isEmpty()) {
199199
enabledABIs = "armeabi-v7a|arm64-v8a|x86|x86_64|"
200200
}
201-
Set<String> exportAbiFilter = [];
201+
Set<String> exportAbiFilter = []
202202
for (String abi_name : enabledABIs.split(VALUE_SEPARATOR_REGEX)) {
203203
if (!abi_name.trim().isEmpty()){
204-
exportAbiFilter.add(abi_name);
204+
exportAbiFilter.add(abi_name)
205205
}
206206
}
207-
return exportAbiFilter;
207+
return exportAbiFilter
208208
}
209209

210210
ext.getExportPath = {

platform/android/java/editor/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ ext {
2020
String versionStatus = System.getenv("GODOT_VERSION_STATUS")
2121
if (versionStatus != null && !versionStatus.isEmpty()) {
2222
try {
23-
buildNumber = Integer.parseInt(versionStatus.replaceAll("[^0-9]", ""));
23+
buildNumber = Integer.parseInt(versionStatus.replaceAll("[^0-9]", ""))
2424
} catch (NumberFormatException ignored) {
2525
buildNumber = 0
2626
}

platform/android/java/editor/src/main/java/org/godotengine/editor/GodotEditor.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ open class GodotEditor : GodotActivity() {
127127
*/
128128
protected open fun checkForProjectPermissionsToEnable() {
129129
// Check for RECORD_AUDIO permission
130-
val audioInputEnabled = java.lang.Boolean.parseBoolean(GodotLib.getGlobal("audio/driver/enable_input"));
130+
val audioInputEnabled = java.lang.Boolean.parseBoolean(GodotLib.getGlobal("audio/driver/enable_input"))
131131
if (audioInputEnabled) {
132132
PermissionsUtil.requestPermission(Manifest.permission.RECORD_AUDIO, this)
133133
}

platform/android/java/lib/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ android {
121121
case "dev":
122122
default:
123123
sconsTarget += "_debug"
124-
break;
124+
break
125125
}
126126
}
127127

platform/android/java/lib/src/org/godotengine/godot/Godot.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@ class Godot(private val context: Context) : SensorEventListener {
152152
private var useApkExpansion = false
153153
private var useImmersive = false
154154
private var useDebugOpengl = false
155-
private var darkMode = false;
155+
private var darkMode = false
156156

157157
private var containerLayout: FrameLayout? = null
158158
var renderView: GodotRenderView? = null
@@ -292,7 +292,7 @@ class Godot(private val context: Context) : SensorEventListener {
292292
initializationStarted = false
293293
throw e
294294
} finally {
295-
endBenchmarkMeasure("Startup", "Godot::onCreate");
295+
endBenchmarkMeasure("Startup", "Godot::onCreate")
296296
}
297297
}
298298

@@ -621,7 +621,7 @@ class Godot(private val context: Context) : SensorEventListener {
621621
// These properties are defined after Godot setup completion, so we retrieve them here.
622622
val longPressEnabled = java.lang.Boolean.parseBoolean(GodotLib.getGlobal("input_devices/pointing/android/enable_long_press_as_right_click"))
623623
val panScaleEnabled = java.lang.Boolean.parseBoolean(GodotLib.getGlobal("input_devices/pointing/android/enable_pan_and_scale_gestures"))
624-
val rotaryInputAxis = java.lang.Integer.parseInt(GodotLib.getGlobal("input_devices/pointing/android/rotary_input_scroll_axis"));
624+
val rotaryInputAxis = java.lang.Integer.parseInt(GodotLib.getGlobal("input_devices/pointing/android/rotary_input_scroll_axis"))
625625

626626
runOnUiThread {
627627
renderView?.inputHandler?.apply {

platform/android/java/lib/src/org/godotengine/godot/vulkan/VkThread.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ internal class VkThread(private val vkSurfaceView: VkSurfaceView, private val vk
142142
fun onSurfaceChanged(width: Int, height: Int) {
143143
lock.withLock {
144144
hasSurface = true
145-
surfaceChanged = true;
145+
surfaceChanged = true
146146
this.width = width
147147
this.height = height
148148

@@ -179,7 +179,7 @@ internal class VkThread(private val vkSurfaceView: VkSurfaceView, private val vk
179179
// blocking the thread lifecycle by holding onto the lock.
180180
if (eventQueue.isNotEmpty()) {
181181
event = eventQueue.removeAt(0)
182-
break;
182+
break
183183
}
184184

185185
if (readyToDraw) {
@@ -199,7 +199,7 @@ internal class VkThread(private val vkSurfaceView: VkSurfaceView, private val vk
199199
}
200200

201201
// Break out of the loop so drawing can occur without holding onto the lock.
202-
break;
202+
break
203203
} else if (rendererResumed) {
204204
// If we aren't ready to draw but are resumed, that means we either lost a surface
205205
// or the app was paused.

0 commit comments

Comments
 (0)