From ccad11ee5e67f6ccd36fb0f016d41c493f3f485e Mon Sep 17 00:00:00 2001
From: Alya Sirko <alya@selfprivacy.org>
Date: Sat, 17 Sep 2022 09:20:24 +0300
Subject: [PATCH] use HEAD in Android nightlies and fix some targets

---
 android/build.gradle                 | 13 +++++++++++++
 ios/Runner.xcodeproj/project.pbxproj |  6 +++---
 windows/runner/Runner.rc             |  4 ++--
 3 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/android/build.gradle b/android/build.gradle
index 31e95773..bf7e09c6 100644
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -1,5 +1,18 @@
 buildscript {
     ext.kotlin_version = '1.6.10'
+    ext.getVersionCode = { ->
+      try {
+        def stdout = new ByteArrayOutputStream()
+        exec {
+          commandLine 'git', 'rev-list', '--first-parent', '--count', 'HEAD'
+          standardOutput = stdout
+        }
+        return Integer.parseInt(stdout.toString().trim())
+      }
+      catch (ignored) {
+        return -1
+      }
+    }
     repositories {
         google()
         jcenter()
diff --git a/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj
index b22b290f..a47c4156 100644
--- a/ios/Runner.xcodeproj/project.pbxproj
+++ b/ios/Runner.xcodeproj/project.pbxproj
@@ -376,7 +376,7 @@
 					"$(inherited)",
 					"$(PROJECT_DIR)/Flutter",
 				);
-				PRODUCT_BUNDLE_IDENTIFIER = pro.kherel.selfprivacy;
+				PRODUCT_BUNDLE_IDENTIFIER = org.selfprivacy.selfprivacy;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
 				SWIFT_VERSION = 5.0;
@@ -516,7 +516,7 @@
 					"$(inherited)",
 					"$(PROJECT_DIR)/Flutter",
 				);
-				PRODUCT_BUNDLE_IDENTIFIER = pro.kherel.selfprivacy;
+				PRODUCT_BUNDLE_IDENTIFIER = org.selfprivacy.selfprivacy;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
@@ -548,7 +548,7 @@
 					"$(inherited)",
 					"$(PROJECT_DIR)/Flutter",
 				);
-				PRODUCT_BUNDLE_IDENTIFIER = pro.kherel.selfprivacy;
+				PRODUCT_BUNDLE_IDENTIFIER = org.selfprivacy.selfprivacy;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
 				SWIFT_VERSION = 5.0;
diff --git a/windows/runner/Runner.rc b/windows/runner/Runner.rc
index e2d13c33..5f63465c 100644
--- a/windows/runner/Runner.rc
+++ b/windows/runner/Runner.rc
@@ -89,11 +89,11 @@ BEGIN
     BEGIN
         BLOCK "040904e4"
         BEGIN
-            VALUE "CompanyName", "pro.kherel" "\0"
+            VALUE "CompanyName", "org.selfprivacy" "\0"
             VALUE "FileDescription", "selfprivacy" "\0"
             VALUE "FileVersion", VERSION_AS_STRING "\0"
             VALUE "InternalName", "selfprivacy" "\0"
-            VALUE "LegalCopyright", "Copyright (C) 2022 pro.kherel. All rights reserved." "\0"
+            VALUE "LegalCopyright", "Copyright (C) 2022 org.selfprivacy. All rights reserved." "\0"
             VALUE "OriginalFilename", "selfprivacy.exe" "\0"
             VALUE "ProductName", "selfprivacy" "\0"
             VALUE "ProductVersion", VERSION_AS_STRING "\0"