diff --git a/android/app/build.gradle b/android/app/build.gradle index 993c94ab..5a0e1953 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -16,6 +16,12 @@ def keystoreProperties = new Properties() def keystorePropertiesFile = rootProject.file('key.properties') if (keystorePropertiesFile.exists()) { keystoreProperties.load(new FileInputStream(keystorePropertiesFile)) +} else { + System.err.printf(" [!] key.properties not found in %s (%s). Build will fail. \n", rootProject, rootProject.file('.')) +} + +if (keystoreProperties['storeFile'] == null || !file(keystoreProperties['storeFile']).exists()) { + System.err.printf(" [!] storeFile defined in key.properties does not exist in %s. Build will fail. \n", file('.')) } def flutterVersionCode = localProperties.getProperty('flutter.versionCode') @@ -57,7 +63,9 @@ android { versionName flutterVersionName ndk { - abiFilters 'arm64-v8a' + if(!splits.abi.enable) { // abiFilters cannot be present when splits abi filters are set + abiFilters 'arm64-v8a', 'armeabi-v7a' + } } } diff --git a/lib/data/res/build_data.dart b/lib/data/res/build_data.dart index 7284372a..b71dd944 100644 --- a/lib/data/res/build_data.dart +++ b/lib/data/res/build_data.dart @@ -2,9 +2,9 @@ class BuildData { static const String name = "ServerBox"; - static const int build = 771; - static const String engine = "3.19.0"; - static const String buildAt = "2024-02-20 16:12:21"; + static const int build = 773; + static const String engine = "3.19.1"; + static const String buildAt = "2024-02-22 11:55:07"; static const int modifications = 8; static const int script = 38; } diff --git a/make.dart b/make.dart index b3ac08f8..0e387db3 100755 --- a/make.dart +++ b/make.dart @@ -21,6 +21,7 @@ var regAppleMarketVer = RegExp(r'MARKETING_VERSION = .+'); const buildFuncs = { 'ios': flutterBuildIOS, 'android': flutterBuildAndroid, + 'apk': flutterBuildAndroid, 'mac': flutterBuildMacOS, 'linux': flutterBuildLinux, 'win': flutterBuildWin, @@ -29,7 +30,7 @@ const buildFuncs = { int? build; Future getGitCommitCount() async { - final result = await Process.run('git', ['log', '--oneline']); + final result = await Process.run('git', ['log', '--format=format:%h']); build = (result.stdout as String) .split('\n') .where((line) => line.isNotEmpty) @@ -42,7 +43,7 @@ Future getScriptCommitCount() async { exit(1); } final result = - await Process.run('git', ['log', '--oneline', shellScriptPath]); + await Process.run('git', ['log', '--format=format:%h', shellScriptPath]); return (result.stdout as String) .split('\n') .where((line) => line.isNotEmpty)