fixed bug in #34 & set the right date time format in ide log & set back official runners & set timeout for actions (#35)

* 更新 QuickRunWithCancellationAction.kt

* set the right date time format in ide log

* set the right date time format

* set a shorter package name for new project

* set back official runners & set timeout for actions

* set back official runners & set timeout for actions

* set timeout for actions

* set back official runners & set timeout for actions

Author: kkgitProMax

.github/workflows/_build-apk-reusable.yml

@@ -64,8 +64,9 @@ env:
 jobs:
   build:
     name: Build APK (${{ inputs.abi_type }},${{ inputs.build_type }})
-    #runs-on: ubuntu-latest
-    runs-on: ${{ fromJSON('["ubuntu-latest", "self-hosted"]')[github.repository == 'github/docs-internal'] }}
+    timeout-minutes: 30  # Force timeout after this
+    runs-on: ubuntu-latest
+    
     outputs:
       ver_name:    ${{ steps.params.outputs.ver_name }}
       short_sha:    ${{ steps.params.outputs.short_sha }}

.github/workflows/build.yml

@@ -17,8 +17,9 @@ concurrency:
 
 jobs:
   read_info:
-    #runs-on: ubuntu-latest
-    runs-on: ${{ fromJSON('["ubuntu-latest", "self-hosted"]')[github.repository == 'github/docs-internal'] }}
+    timeout-minutes: 10  # Force timeout after this
+    runs-on: ubuntu-latest
+    
     outputs:
       ver_name: ${{ steps.info.outputs.ver_name }}
     steps:

.github/workflows/delete_branch.yml

@@ -10,6 +10,7 @@ on:
 
 jobs:
   delete:
+    timeout-minutes: 5  # Force timeout after this
     runs-on: ubuntu-latest
     permissions:
       contents: write

.github/workflows/release.yml

@@ -10,8 +10,9 @@ concurrency:
 
 jobs:
   check:
-    #runs-on: ubuntu-latest
-    runs-on: ${{ fromJSON('["ubuntu-latest", "self-hosted"]')[github.repository == 'github/docs-internal'] }}
+    timeout-minutes: 20  # Force timeout after this
+    runs-on: ubuntu-latest
+    
     outputs:
       final_tag:  ${{ steps.final_tag.outputs.final_tag }}
       ver_name:   ${{ steps.info.outputs.ver_name }}
@@ -116,8 +117,9 @@ jobs:
 
   create_tag:
     needs: [check, build_all_abi]
-    #runs-on: ubuntu-latest
-    runs-on: ${{ fromJSON('["ubuntu-latest", "self-hosted"]')[github.repository == 'github/docs-internal'] }}
+    timeout-minutes: 10  # Force timeout after this
+    runs-on: ubuntu-latest
+    
     steps:
 
       - name: Checkout
@@ -135,8 +137,9 @@ jobs:
 
   publish_release:
     needs: [check, build_all_abi, create_tag]
-    #runs-on: ubuntu-latest
-    runs-on: ${{ fromJSON('["ubuntu-latest", "self-hosted"]')[github.repository == 'github/docs-internal'] }}
+    timeout-minutes: 10  # Force timeout after this
+    runs-on: ubuntu-latest
+    
     steps:
 
       - name: Checkout

core/app/src/main/java/com/itsaky/androidide/actions/build/QuickRunWithCancellationAction.kt

@@ -169,7 +169,25 @@ class QuickRunWithCancellationAction(context: Context, override val order: Int)
 
       handleResult(data, result, module, variant)
     }.invokeOnCompletion { error ->
-      if (error != null) {
+
+        when {
+            error == null -> return@invokeOnCompletion
+            error is java.util.concurrent.CancellationException -> {
+            // 1. when cancel -> debug
+                log.debug(
+                    "QuickRun cancelled. type: {}, Message: {}",
+                    error?.javaClass?.name ?: "Unknown error type",
+                    error?.message ?: "No error message",
+                    //error.javaClass.simpleName,
+                    //error.message ?: "No message"
+                )
+                return@invokeOnCompletion
+            }
+            // 2. else -> continue
+            else -> Unit
+        }
+    
+      //if (error != null) {
         //log.error("Failed to run '{}'", taskName, error)
         log.error(
             "Failed to run task '{}'. Error type: {}, Message: {}",
@@ -178,7 +196,7 @@ class QuickRunWithCancellationAction(context: Context, override val order: Int)
             error?.message ?: "No error message",
             error
         )
-      }
+      //}
     }
   }
 

logging/logger/src/main/java/com/itsaky/androidide/logging/encoder/IDELogFormatLayout.java

@@ -45,7 +45,7 @@ public boolean isOmitMessage() {
 
   @Override
   public String doLayout(ILoggingEvent event) {
-    final SimpleDateFormat format = new SimpleDateFormat("dd-MM HH:mm:ss.SSS", Locale.ROOT);
+    final SimpleDateFormat format = new SimpleDateFormat("MM-dd HH:mm:ss.SSS", Locale.ROOT);
     final var date = format.format(new Date(event.getTimeStamp()));
 
     final var builder = new StringBuilder();

logging/logger/src/main/java/com/itsaky/androidide/logging/encoder/ThreadTimeEncoder.java

@@ -40,7 +40,7 @@ public byte[] headerBytes() {
   @Override
   public byte[] encode(ILoggingEvent event) {
     final var sb = new StringBuilder();
-    final var date = new SimpleDateFormat("dd-MM HH:mm:ss.SSS", Locale.ROOT).format(
+    final var date = new SimpleDateFormat("MM-dd HH:mm:ss.SSS", Locale.ROOT).format(
         new Date(event.getTimeStamp()));
     var tag = event.getLoggerName();
     if (tag.length() > LogUtils.MAX_TAG_LENGTH) {

utilities/templates-api/src/main/java/com/itsaky/androidide/templates/parameters.kt

@@ -374,7 +374,7 @@ inline fun projectNameParameter(crossinline configure: StringParameterBuilder.()
 inline fun packageNameParameter(crossinline configure: StringParameterBuilder.() -> Unit = {}) =
   stringParameter {
     name = string.package_name
-    default = "com.example.myapplication"
+    default = "com.ide.app"
     startIcon = { R.drawable.ic_package }
     constraints = listOf(NONEMPTY, PACKAGE)