Merge pull request #148 from OpenBrickProtocolFoundation/only-define-version-in-one-place

Only define version in one place

Author: Totto16

.github/workflows/android.yml

@@ -33,7 +33,7 @@ jobs:
       - name: Setup ninja
         run: |
             sudo apt-get update
-            sudo apt-get install ninja-build
+            sudo apt-get install ninja-build jq
 
       - name: Setup JDK
         uses: actions/setup-java@v4

platforms/android/app/build.gradle

@@ -7,18 +7,77 @@ if (buildAsApplication) {
     apply plugin: 'com.android.library'
 }
 
-boolean existsABIDir(String abi) {
+/**
+ * Internal helper function
+ */
+File getABIDir(String abi) {
     String path = "../../../../build-" + abi;
     File file = project.file(project.getLayout().getBuildDirectory().file(path));
-    return file.exists();
+    return file;
+}
+
+/**
+ * Internal helper function
+ */
+boolean existsABIDir(String abi) {
+    File file = getABIDir(abi);
+    return file.exists() && file.isDirectory();
+}
+
+/**
+ * Internal helper function
+ */
+static List<String> readInputStream(InputStream stream) {
+    InputStreamReader reader = new InputStreamReader(stream);
+    return reader.readLines()
+}
+
+/**
+ * Internal helper function
+ */
+static Tuple3<List<String>, List<String>, Integer> executePipeline(List<List<String>> commands) {
+    List<ProcessBuilder> builders = commands.collect { it -> new ProcessBuilder(it) };
+
+    List<Process> processes = ProcessBuilder.startPipeline(builders);
+    Process last = processes.get(processes.size() - 1);
+
+    int exitCode = last.waitFor();
+
+    List<String> stdout = readInputStream(last.getInputStream());
+    List<String> stderr = readInputStream(last.getErrorStream());
+
+    return new Tuple3<List<String>, List<String>, Integer>(stdout, stderr, exitCode);
+}
+
+/**
+ * Internal helper function
+ */
+static boolean isValidVersion(String version) {
+    if (version == null) {
+        return false;
+    }
+
+    List<String> parts = version.split("\\.")
+
+    if (parts.size() != 3) {
+        return false;
+    }
+
+    for (part in parts) {
+        if (!part.isInteger()) {
+            return false;
+        }
+    }
+
+    return true;
 }
 
 /**
  * Read the Android ABI from user input.
  * supported ANDROID_ABIs are 'arm64-v8a', 'armeabi-v7a', 'x86', 'x86_64'
- * @return return
+ * @return List<String>
  */
-def List getAndroidABI() {
+List getAndroidABIs() {
     String property = project.findProperty('ANDROID_ABI')
 
     List<String> supportedABIs = ["armeabi-v7a", "arm64-v8a", "x86", "x86_64"];
@@ -49,7 +108,7 @@ def List getAndroidABI() {
 
     for (abi in AbiFilters) {
         if (!existsABIDir(abi)) {
-            throw new Exception('ERROR: build folder for abi \'' + abi + '\' doesn\'t  exist: ' + file);
+            throw new Exception("ERROR: build folder for abi '" + abi + "' doesn't  exist: " + file);
         }
     }
 
@@ -60,8 +119,99 @@ def List getAndroidABI() {
     return AbiFilters
 }
 
+
+/**
+ * Determine the version
+ * if you specify it explicitly, that will be used, otherwise meson introspect will be called
+ * @return String
+ */
+String getVersion() {
+    String property = project.findProperty('VERSION')
+
+
+    if (property != null) {
+        if (!isValidVersion(property)) {
+            throw new Exception('User defined version is invalid: ' + property);
+        }
+
+        return property;
+    }
+
+    // auto detect
+
+    List<String> abis = getAndroidABIs();
+    List<String> versions = new ArrayList<String>();
+
+    for (abi in abis) {
+        File abiDir = getABIDir(abi);
+
+        Tuple3<List<String>, List<String>, Integer> versionResult = executePipeline(Arrays.asList(
+                Arrays.asList("meson", "introspect", "--projectinfo", abiDir.getAbsolutePath()),
+                Arrays.asList("jq", "-r", ".version")
+        ));
+
+        if (versionResult.getV3() != 0) {
+            throw new Exception(
+                    'An error occured while trying to detect the version: process exited with exit code: ' +
+                            versionResult.getV3() +
+                            ' and stderr:\n' +
+                            versionResult.getV2().join("\n")
+            );
+        }
+
+        if (versionResult.getV2() != null && !versionResult.getV2().isEmpty()) {
+            throw new Exception('An error occured while trying to detect the version (code 1): ' + versionResult.getV2().join("\n"));
+        }
+
+        if (versionResult.getV1() == null || versionResult.getV1().size() != 1) {
+            throw new Exception('An error occured while trying to detect the version (code 2): ' + versionResult.getV1().join("\n"));
+        }
+
+        String version = versionResult.getV1()[0];
+
+        if (!isValidVersion(version)) {
+            throw new Exception("Auto detection of version returned invalid version: '" + version + "'");
+        }
+
+        for (version1 in versions) {
+            if (version != version1) {
+                throw new Exception("Recievd two versions, that didn't match: " + version1 + " != " + version);
+            }
+        }
+
+        versions.add(version);
+
+    }
+
+
+    if (versions.size() == 0) {
+        throw new Exception("ERROR: at least one version has to be detected (at least one abi has to be returend by 'getAndroidABIs()')");
+    }
+
+    // we guarantee, that every string in there is the same, and that it has at least one entry 
+    return versions[0];
+
+}
+
+List<String> abisToUse = getAndroidABIs()
+String versionString = getVersion()
+
+System.out.printf("DEBUG: Using abis: %s%n", abisToUse.join(", "))
+System.out.printf("DEBUG: Using version: %s%n", versionString)
+
+java {
+    toolchain {
+        languageVersion = JavaLanguageVersion.of(21)
+    }
+}
+
 android {
-    compileSdk 34
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_21
+        targetCompatibility JavaVersion.VERSION_21
+    }
+
+    compileSdkVersion 34
     ndkVersion "26.3.11579264"
     defaultConfig {
         if (buildAsApplication) {
@@ -70,7 +220,7 @@ android {
         minSdkVersion 21
         targetSdkVersion 34
         versionCode 5
-        versionName "0.5.4"
+        versionName(versionString)
     }
     buildTypes {
         release {
@@ -119,7 +269,7 @@ android {
             // Resets the list of ABIs for Gradle to create APKs for to none.
             reset()
             // Specifies a list of ABIs for Gradle to create APKs for.
-            include(*getAndroidABI())
+            include(*abisToUse)
             // Specifies that you don't want to also generate a universal APK that includes all ABIs.
             universalApk false
         }

platforms/android/build.gradle

@@ -6,7 +6,7 @@ buildscript {
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:8.3.1'
+        classpath 'com.android.tools.build:gradle:8.4.0'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files

platforms/android/gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 #Tue Jan 02 02:01:38 CET 2024
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

platforms/build-switch.sh

@@ -101,7 +101,7 @@ libnx='$LIBNX'
 
 APP_NAME	= 'oopetris'
 APP_AUTHOR 	= 'coder2k'
-APP_VERSION = '0.5.4'
+APP_VERSION = true
 
 USE_NACP    = true
 

platforms/switch/meson.build

@@ -1,11 +1,9 @@
-
 ## get the options object and "unpack" it
 
 switch_exe_name = switch_options[0]
 switch_src_files = switch_options[1]
 switch_deps = switch_options[2]
 
-
 # libraries
 
 switch_dependencies = [
@@ -32,7 +30,6 @@ switch_dependencies_native = [
     'SDL2main',
 ]
 
-
 foreach dep : switch_dependencies
     switch_deps += dependency(
         dep,
@@ -56,8 +53,6 @@ foreach dep : switch_dependencies_native
     )
 endforeach
 
-
-
 ## compilation
 
 switch_elf_file = build_target(
@@ -76,7 +71,6 @@ use_nacp = ['true', 'True', '1', true].contains(
     meson.get_external_property('USE_NACP', ''),
 )
 
-
 elf2nro = find_program('elf2nro')
 # executable input elf file, output nro file
 NRO_FLAGS = [elf2nro, switch_elf_file.full_path(), switch_exe_name + '.nro']
@@ -92,23 +86,23 @@ if use_nacp
     APP_NAME = meson.get_external_property('APP_NAME', switch_exe_name)
     NACP_FLAGS += APP_NAME
 
-
     APP_AUTHOR = meson.get_external_property('APP_AUTHOR', '')
     if APP_AUTHOR == ''
         error('If USE_NACP is set, you have to provide an APP_AUTHOR')
     endif
     NACP_FLAGS += APP_AUTHOR
 
     APP_VERSION = meson.get_external_property('APP_VERSION', '')
+    if APP_VERSION == true
+        APP_VERSION = meson.project_version()
+    endif
+
     if APP_VERSION == ''
         error('If USE_NACP is set, you have to provide an APP_VERSION')
     endif
     NACP_FLAGS += APP_VERSION
 
-    NACP_FLAGS += (
-        switch_exe_name + '.nacp' # outfile
-    )
-
+    NACP_FLAGS += (switch_exe_name + '.nacp')
 
     APP_TITLEID = meson.get_external_property('APP_TITLEID', '')
 
@@ -117,8 +111,7 @@ if use_nacp
         NACP_FLAGS += '--titleid=' + APP_TITLEID
     endif
 
-
-    # nacptool --create <name> <author> <version> <switch_exe_name>.nacp 
+    # nacptool --create <name> <author> <version> <switch_exe_name>.nacp
     # optional: --titleid=<titleID>
     nacp_file = custom_target(
         switch_exe_name + '.nacp',
@@ -129,7 +122,6 @@ if use_nacp
     NRO_FLAGS += '--nacp=' + switch_exe_name + '.nacp'
     NRO_DEPS += nacp_file
 
-
 endif
 
 LIBNX = meson.get_external_property('libnx', '')
@@ -145,16 +137,12 @@ if not fs.is_absolute(APP_ICON)
     APP_ICON = meson.project_source_root() / APP_ICON
 endif
 
-
 if not fs.exists(APP_ICON)
     error('APP_ICON should exist, but doesn\'t: \'' + APP_ICON + '\'')
 endif
 
-
-
 NRO_FLAGS += '--icon=' + APP_ICON
 
-
 APP_ROMFS = meson.get_external_property('APP_ROMFS', '')
 
 if APP_ROMFS != ''