Insert assets on project generation stage, add static versioning (makes sense on project regeneration)

client/AmneziaVPN/Images.xcassets/AppIcon.appiconset/Contents.json

@@ -1,62 +0,0 @@
-{
-  "images" : [
-    {
-      "filename" : "icon_40x40.png",
-      "idiom" : "iphone",
-      "scale" : "2x",
-      "size" : "20x20"
-    },
-    {
-      "filename" : "icon_60x60.png",
-      "idiom" : "iphone",
-      "scale" : "3x",
-      "size" : "20x20"
-    },
-    {
-      "filename" : "icon_58x58.png",
-      "idiom" : "iphone",
-      "scale" : "2x",
-      "size" : "29x29"
-    },
-    {
-      "filename" : "icon_87x87.png",
-      "idiom" : "iphone",
-      "scale" : "3x",
-      "size" : "29x29"
-    },
-    {
-      "filename" : "icon_80x80.png",
-      "idiom" : "iphone",
-      "scale" : "2x",
-      "size" : "40x40"
-    },
-    {
-      "filename" : "icon_120x120.png",
-      "idiom" : "iphone",
-      "scale" : "3x",
-      "size" : "40x40"
-    },
-    {
-      "filename" : "icon_120x120-1.png",
-      "idiom" : "iphone",
-      "scale" : "2x",
-      "size" : "60x60"
-    },
-    {
-      "filename" : "icon_180x180.png",
-      "idiom" : "iphone",
-      "scale" : "3x",
-      "size" : "60x60"
-    },
-    {
-      "filename" : "icon_1024x1024.png",
-      "idiom" : "ios-marketing",
-      "scale" : "1x",
-      "size" : "1024x1024"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}

client/AmneziaVPN/Images.xcassets/Contents.json

@@ -1,6 +0,0 @@
-{
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}

client/fastlane/report.xml

@@ -5,52 +5,52 @@
     
     
       
-      <testcase classname="fastlane.lanes" name="0: default_platform" time="0.000294">
+      <testcase classname="fastlane.lanes" name="0: default_platform" time="0.000364">
         
       </testcase>
     
       
-      <testcase classname="fastlane.lanes" name="1: Switch to certificates lane" time="0.000162">
+      <testcase classname="fastlane.lanes" name="1: Switch to certificates lane" time="0.000171">
         
       </testcase>
     
       
-      <testcase classname="fastlane.lanes" name="2: match" time="16.218694">
+      <testcase classname="fastlane.lanes" name="2: match" time="3.198096">
         
       </testcase>
     
       
-      <testcase classname="fastlane.lanes" name="3: notification" time="0.234117">
+      <testcase classname="fastlane.lanes" name="3: notification" time="0.23742">
         
       </testcase>
     
       
-      <testcase classname="fastlane.lanes" name="4: clean_build_artifacts" time="0.000678">
+      <testcase classname="fastlane.lanes" name="4: clean_build_artifacts" time="0.000377">
         
       </testcase>
     
       
-      <testcase classname="fastlane.lanes" name="5: build_app" time="245.559392">
+      <testcase classname="fastlane.lanes" name="5: build_app" time="233.201786">
         
       </testcase>
     
       
-      <testcase classname="fastlane.lanes" name="6: testflight" time="66.240632">
+      <testcase classname="fastlane.lanes" name="6: testflight" time="77.518086">
         
       </testcase>
     
       
-      <testcase classname="fastlane.lanes" name="7: get_version_number" time="0.122953">
+      <testcase classname="fastlane.lanes" name="7: get_version_number" time="0.120716">
         
       </testcase>
     
       
-      <testcase classname="fastlane.lanes" name="8: get_build_number" time="1.192314">
+      <testcase classname="fastlane.lanes" name="8: get_build_number" time="1.105765">
         
       </testcase>
     
       
-      <testcase classname="fastlane.lanes" name="9: increment_build_number" time="2.5453">
+      <testcase classname="fastlane.lanes" name="9: increment_build_number" time="2.668868">
         
       </testcase>
     

client/ios/app/Info.plist

@@ -25,7 +25,7 @@
 	<key>CFBundleShortVersionString</key>
 	<string>$(MARKETING_VERSION)</string>
 	<key>CFBundleVersion</key>
-	<string>3</string>
+	<string>5</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<false/>
 	<key>LSRequiresIPhoneOS</key>

client/macos/networkextension/Info.plist

@@ -19,7 +19,7 @@
 	<key>CFBundleShortVersionString</key>
 	<string>$(MARKETING_VERSION)</string>
 	<key>CFBundleVersion</key>
-	<string>3</string>
+	<string>5</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<false/>
 	<key>LSMinimumSystemVersion</key>

client/scripts/ios_compile.sh

@@ -140,8 +140,10 @@ print G "done."
 #python scripts/generate_glean.py || die "Failed to generate glean samples"
 
 printn Y "Extract the project version... "
+#SHORTVERSION=$(cat version.pri | grep VERSION | grep defined | cut -d= -f2 | tr -d \ )
+#FULLVERSION=$(echo $SHORTVERSION | cut -d. -f1).$(date +"%Y%m%d%H%M")
 SHORTVERSION=$(cat version.pri | grep VERSION | grep defined | cut -d= -f2 | tr -d \ )
-FULLVERSION=$(echo $SHORTVERSION | cut -d. -f1).$(date +"%Y%m%d%H%M")
+FULLVERSION=$(cat versionfull.pri | grep BUILDVERSION | grep defined | cut -d= -f2 | tr -d \ )
 print G "$SHORTVERSION - $FULLVERSION"
 
 MACOS_FLAGS="
@@ -230,14 +232,14 @@ else
   print Y "No ShadowSocket Library will be built"
 fi
 
-if [ "$OS" = "ios" ]; then
-  print Y "Prepare to build Packet Processor..."
-  prepare_to_build_pp
-  print Y "Building PacketProcessor Framework..."
-  compile_packet_processor
-else
-  print Y "No Packet Processor will be built"
-fi
+#if [ "$OS" = "ios" ]; then
+# print Y "Prepare to build Packet Processor..."
+# prepare_to_build_pp
+# print Y "Building PacketProcessor Framework..."
+# compile_packet_processor
+#else
+# print Y "No Packet Processor will be built"
+#fi
 
 print Y "Creating the xcode project via qmake..."
 $QMAKE \

client/scripts/xcode_patcher.rb

@@ -62,7 +62,11 @@ class XCodeprojPatcher
       config.build_settings['FRAMEWORK_SEARCH_PATHS'] ||= [
         "$(inherited)",
         "$(PROJECT_DIR)/3rd",
-        "$(PROJECT_DIR)/3rd/OpenVPNAdapter/build/Debug-iphoneos"
+        "$(PROJECT_DIR)/3rd/OpenVPNAdapter/build/Release-iphoneos",
+#       "$(PROJECT_DIR)/3rd/ShadowSocks/build/Release-iphoneos",
+#       "$(PROJECT_DIR)/3rd/PacketProcessor/build/Release-iphoneos",
+#       "$(PROJECT_DIR)/3rd/outline-go-tun2socks/build/ios",
+#       "${PROJECT_DIR}/3rd/PacketProcessor/PacketProcessor/CocoaAsyncSocket",
       ]
 
       # Versions and names
@@ -71,6 +75,8 @@ class XCodeprojPatcher
       config.build_settings['PRODUCT_BUNDLE_IDENTIFIER'] = configHash['APP_ID_MACOS'] if platform == 'macos'
       config.build_settings['PRODUCT_BUNDLE_IDENTIFIER'] = configHash['APP_ID_IOS'] if platform == 'ios'
       config.build_settings['PRODUCT_NAME'] = 'AmneziaVPN'
+      config.build_settings['SYMROOT'] = 'build'
+      config.build_settings['ASSETCATALOG_COMPILER_APPICON_NAME'] = 'AppIcon'
 
       # other config
       config.build_settings['INFOPLIST_FILE'] ||= platform + '/app/Info.plist'
@@ -111,8 +117,12 @@ class XCodeprojPatcher
       end
     end
     
-#   images_ref = @target_main.new_reference('ios/app/Images.xcassets')
-#   @target_main.add_resources([images_ref])
+    # add assets to main target
+    assets_group = @project.main_group.new_group('Assets')
+    
+    assets_path = 'ios/Media.xcassets'
+    assets_ref = assets_group.new_reference(assets_path, :group)
+    @target_main.add_resources([assets_ref])
 
     if networkExtension
       # WireGuard group
@@ -260,9 +270,10 @@ class XCodeprojPatcher
         "$(inherited)",
         "$(PROJECT_DIR)/3rd",
         "$(PROJECT_DIR)/3rd/OpenVPNAdapter/build/Release-iphoneos",
-#       "$(PROJECT_DIR)/3rd/ShadowSocks/build/Release-iphoneos/",
-#       "$(PROJECT_DIR)/3rd/PacketProcessor/build/Release-iphoneos/",
-#       "$(PROJECT_DIR)/3rd/outline-go-tun2socks/build/ios/"
+#       "$(PROJECT_DIR)/3rd/ShadowSocks/build/Release-iphoneos",
+#       "$(PROJECT_DIR)/3rd/PacketProcessor/build/Release-iphoneos",
+#       "$(PROJECT_DIR)/3rd/outline-go-tun2socks/build/ios",
+#       "${PROJECT_DIR}/3rd/PacketProcessor/PacketProcessor/CocoaAsyncSocket",
       ]
 
       # Versions and names
@@ -386,7 +397,7 @@ class XCodeprojPatcher
 #   
 #   framework_ref = frameworks_group.new_file('3rd/PacketProcessor/PacketProcessor/CocoaAsyncSocket/CocoaAsyncSocket.framework')
 #   frameworks_build_phase.add_file_reference(framework_ref)
-#   
+#
 #   framework_ref = frameworks_group.new_file('3rd/outline-go-tun2socks/build/ios/Tun2socks.framework')
 #   frameworks_build_phase.add_file_reference(framework_ref)
     

client/version.pri

@@ -2,4 +2,4 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-!defined(VERSION, var):VERSION = 1
+!defined(VERSION, var):VERSION = 2

client/versionfull.pri

@@ -0,0 +1 @@
+!defined(BUILDVERSION, var):BUILDVERSION = 5