From c733a98dcfd480a0d689e8d7d73b6fd1090d694e Mon Sep 17 00:00:00 2001 From: msx80 Date: Fri, 21 Nov 2025 15:07:56 +0000 Subject: [PATCH 1/8] Fix for build of com.github.msx80.doorsofdoom --- metadata/com.github.msx80.doorsofdoom.yml | 32 ++++++++++++++++++++--- 1 file changed, 28 insertions(+), 4 deletions(-) diff --git a/metadata/com.github.msx80.doorsofdoom.yml b/metadata/com.github.msx80.doorsofdoom.yml index 467ed293185..e7bf0152e7a 100644 --- a/metadata/com.github.msx80.doorsofdoom.yml +++ b/metadata/com.github.msx80.doorsofdoom.yml @@ -9,7 +9,7 @@ Donate: https://www.paypal.com/paypalme/msx80 AutoName: DoorsOfDoom RepoType: git -Repo: https://github.com/msx80/DoorsOfDoomOmicron +Repo: https://github.com/msx80/DoorsOfDoomOmicron.git Builds: - versionName: 0.0.4 @@ -59,8 +59,32 @@ Builds: - mvn -f android-mvn/pom.xml -Dcartridge.artifactId=doorsofdoom -Dcartridge.groupId=com.github.msx80.omicron -Dcartridge.version=$$VERSION$$ clean install android:apk + - versionName: 0.0.7 + versionCode: 7 + commit: 127cd6b55a65de9ceca7b940b819fd8b785029bc + subdir: app + sudo: + - apt-get update + - apt-get install -y maven + gradle: + - yes + prebuild: + - sdkmanager "build-tools;33.0.2" "platforms;android-26" "platforms;android-34" + - mvn -f doorsofdoom/pom.xml clean install + - git clone --no-checkout --depth=1 --filter=tree:0 https://github.com/msx80/Omicron.git + - cd Omicron + - git sparse-checkout set --no-cone /wrappers/android-wrapper + - git checkout + - cd .. + - mv Omicron/wrappers/android-wrapper/* . + - echo -e "\ncartridge.version=$$VERSION$$" >> gradle.properties + gradleprops: + - cartridge.artifactId=doorsofdoom + - cartridge.groupId=com.github.msx80.omicron + - omicron.version=0.0.12 + AutoUpdateMode: Version UpdateCheckMode: Tags -UpdateCheckData: doorsofdoom/src/main/resources/omicron.properties|omicron.versionCode=(\d+)||([\d.]+) -CurrentVersion: 0.0.6 -CurrentVersionCode: 3 +UpdateCheckData: doorsofdoom/pom.xml|\d+\.\d+\.(\d+)<\/version>||([\d.]+) +CurrentVersion: 0.0.7 +CurrentVersionCode: 7 -- GitLab From 2768b000ce887870a4dc3439bf4460693a630b50 Mon Sep 17 00:00:00 2001 From: msx80 Date: Mon, 24 Nov 2025 10:01:19 +0000 Subject: [PATCH 2/8] using submodules --- metadata/com.github.msx80.doorsofdoom.yml | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/metadata/com.github.msx80.doorsofdoom.yml b/metadata/com.github.msx80.doorsofdoom.yml index e7bf0152e7a..f1700aaed3c 100644 --- a/metadata/com.github.msx80.doorsofdoom.yml +++ b/metadata/com.github.msx80.doorsofdoom.yml @@ -61,8 +61,9 @@ Builds: - versionName: 0.0.7 versionCode: 7 - commit: 127cd6b55a65de9ceca7b940b819fd8b785029bc + commit: cc965d20bc5ab2d9cfe8f0370c1ef7d04323aac7 subdir: app + submodules: true sudo: - apt-get update - apt-get install -y maven @@ -71,11 +72,6 @@ Builds: prebuild: - sdkmanager "build-tools;33.0.2" "platforms;android-26" "platforms;android-34" - mvn -f doorsofdoom/pom.xml clean install - - git clone --no-checkout --depth=1 --filter=tree:0 https://github.com/msx80/Omicron.git - - cd Omicron - - git sparse-checkout set --no-cone /wrappers/android-wrapper - - git checkout - - cd .. - mv Omicron/wrappers/android-wrapper/* . - echo -e "\ncartridge.version=$$VERSION$$" >> gradle.properties gradleprops: -- GitLab From 4a5baf39a4963bb99a235f0a483cecc897d3dde6 Mon Sep 17 00:00:00 2001 From: msx80 Date: Mon, 24 Nov 2025 10:10:22 +0000 Subject: [PATCH 3/8] removed subdir --- metadata/com.github.msx80.doorsofdoom.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/metadata/com.github.msx80.doorsofdoom.yml b/metadata/com.github.msx80.doorsofdoom.yml index f1700aaed3c..be7599ce56f 100644 --- a/metadata/com.github.msx80.doorsofdoom.yml +++ b/metadata/com.github.msx80.doorsofdoom.yml @@ -62,7 +62,6 @@ Builds: - versionName: 0.0.7 versionCode: 7 commit: cc965d20bc5ab2d9cfe8f0370c1ef7d04323aac7 - subdir: app submodules: true sudo: - apt-get update -- GitLab From 1f3f8041b9086a0eec5cfa607e9e5c84d68cce94 Mon Sep 17 00:00:00 2001 From: msx80 Date: Mon, 24 Nov 2025 10:42:35 +0000 Subject: [PATCH 4/8] fixed omicron upstream to remove "sus" files --- metadata/com.github.msx80.doorsofdoom.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/metadata/com.github.msx80.doorsofdoom.yml b/metadata/com.github.msx80.doorsofdoom.yml index be7599ce56f..dd31a9241ac 100644 --- a/metadata/com.github.msx80.doorsofdoom.yml +++ b/metadata/com.github.msx80.doorsofdoom.yml @@ -61,7 +61,7 @@ Builds: - versionName: 0.0.7 versionCode: 7 - commit: cc965d20bc5ab2d9cfe8f0370c1ef7d04323aac7 + commit: 0c4de0a32efffac027bbaa88da73ee1723f3d5dc submodules: true sudo: - apt-get update -- GitLab From f843d0f7c24dbf87b3cd83e0acf1f25d6b843b0e Mon Sep 17 00:00:00 2001 From: msx80 Date: Mon, 24 Nov 2025 10:55:43 +0000 Subject: [PATCH 5/8] Removed even more sus files -- GitLab From 450b24952d1288b1d62b22330966725f8cd73855 Mon Sep 17 00:00:00 2001 From: msx80 Date: Mon, 24 Nov 2025 11:06:59 +0000 Subject: [PATCH 6/8] right version --- metadata/com.github.msx80.doorsofdoom.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/metadata/com.github.msx80.doorsofdoom.yml b/metadata/com.github.msx80.doorsofdoom.yml index dd31a9241ac..7c100496a8a 100644 --- a/metadata/com.github.msx80.doorsofdoom.yml +++ b/metadata/com.github.msx80.doorsofdoom.yml @@ -61,7 +61,7 @@ Builds: - versionName: 0.0.7 versionCode: 7 - commit: 0c4de0a32efffac027bbaa88da73ee1723f3d5dc + commit: 44b070a05c2c96b5508391e1aa82055350085cea submodules: true sudo: - apt-get update -- GitLab From bbcb9d697e79b66dcb703474aebe251fe036b197 Mon Sep 17 00:00:00 2001 From: linsui <2873532-linsui@users.noreply.gitlab.com> Date: Mon, 24 Nov 2025 11:28:34 +0000 Subject: [PATCH 7/8] Apply 2 suggestion(s) to 1 file(s) --- metadata/com.github.msx80.doorsofdoom.yml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/metadata/com.github.msx80.doorsofdoom.yml b/metadata/com.github.msx80.doorsofdoom.yml index 7c100496a8a..b6765913a3c 100644 --- a/metadata/com.github.msx80.doorsofdoom.yml +++ b/metadata/com.github.msx80.doorsofdoom.yml @@ -62,6 +62,7 @@ Builds: - versionName: 0.0.7 versionCode: 7 commit: 44b070a05c2c96b5508391e1aa82055350085cea + subdir: Omicron/wrappers/android-wrapper/app submodules: true sudo: - apt-get update @@ -70,9 +71,10 @@ Builds: - yes prebuild: - sdkmanager "build-tools;33.0.2" "platforms;android-26" "platforms;android-34" - - mvn -f doorsofdoom/pom.xml clean install - - mv Omicron/wrappers/android-wrapper/* . - - echo -e "\ncartridge.version=$$VERSION$$" >> gradle.properties + - echo -e "\ncartridge.version=$$VERSION$$" >> ../gradle.properties + build: + - cd ../../../.. + - mvn -f doorsofdoom/pom.xml install gradleprops: - cartridge.artifactId=doorsofdoom - cartridge.groupId=com.github.msx80.omicron -- GitLab From ca3187f939ffdf2c5c9dada93e3986292cd0ba77 Mon Sep 17 00:00:00 2001 From: linsui <2873532-linsui@users.noreply.gitlab.com> Date: Mon, 24 Nov 2025 11:36:04 +0000 Subject: [PATCH 8/8] Apply 1 suggestion(s) to 1 file(s) --- metadata/com.github.msx80.doorsofdoom.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/metadata/com.github.msx80.doorsofdoom.yml b/metadata/com.github.msx80.doorsofdoom.yml index b6765913a3c..9a236209ffb 100644 --- a/metadata/com.github.msx80.doorsofdoom.yml +++ b/metadata/com.github.msx80.doorsofdoom.yml @@ -72,7 +72,6 @@ Builds: prebuild: - sdkmanager "build-tools;33.0.2" "platforms;android-26" "platforms;android-34" - echo -e "\ncartridge.version=$$VERSION$$" >> ../gradle.properties - build: - cd ../../../.. - mvn -f doorsofdoom/pom.xml install gradleprops: -- GitLab