diff --git a/client/AmneziaVPN/Images.xcassets/AppIcon.appiconset/Contents.json b/client/AmneziaVPN/Images.xcassets/AppIcon.appiconset/Contents.json deleted file mode 100644 index 25af9c29..00000000 --- a/client/AmneziaVPN/Images.xcassets/AppIcon.appiconset/Contents.json +++ /dev/null @@ -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 - } -} diff --git a/client/AmneziaVPN/Images.xcassets/AppIcon.appiconset/icon_1024x1024.png b/client/AmneziaVPN/Images.xcassets/AppIcon.appiconset/icon_1024x1024.png deleted file mode 100644 index 695a30a5..00000000 Binary files a/client/AmneziaVPN/Images.xcassets/AppIcon.appiconset/icon_1024x1024.png and /dev/null differ diff --git a/client/AmneziaVPN/Images.xcassets/AppIcon.appiconset/icon_120x120-1.png b/client/AmneziaVPN/Images.xcassets/AppIcon.appiconset/icon_120x120-1.png deleted file mode 100644 index 4349d194..00000000 Binary files a/client/AmneziaVPN/Images.xcassets/AppIcon.appiconset/icon_120x120-1.png and /dev/null differ diff --git a/client/AmneziaVPN/Images.xcassets/AppIcon.appiconset/icon_120x120.png b/client/AmneziaVPN/Images.xcassets/AppIcon.appiconset/icon_120x120.png deleted file mode 100644 index 4349d194..00000000 Binary files a/client/AmneziaVPN/Images.xcassets/AppIcon.appiconset/icon_120x120.png and /dev/null differ diff --git a/client/AmneziaVPN/Images.xcassets/AppIcon.appiconset/icon_180x180.png b/client/AmneziaVPN/Images.xcassets/AppIcon.appiconset/icon_180x180.png deleted file mode 100644 index 4bf6715a..00000000 Binary files a/client/AmneziaVPN/Images.xcassets/AppIcon.appiconset/icon_180x180.png and /dev/null differ diff --git a/client/AmneziaVPN/Images.xcassets/AppIcon.appiconset/icon_40x40.png b/client/AmneziaVPN/Images.xcassets/AppIcon.appiconset/icon_40x40.png deleted file mode 100644 index ad3d0746..00000000 Binary files a/client/AmneziaVPN/Images.xcassets/AppIcon.appiconset/icon_40x40.png and /dev/null differ diff --git a/client/AmneziaVPN/Images.xcassets/AppIcon.appiconset/icon_58x58.png b/client/AmneziaVPN/Images.xcassets/AppIcon.appiconset/icon_58x58.png deleted file mode 100644 index dbacdbe7..00000000 Binary files a/client/AmneziaVPN/Images.xcassets/AppIcon.appiconset/icon_58x58.png and /dev/null differ diff --git a/client/AmneziaVPN/Images.xcassets/AppIcon.appiconset/icon_60x60.png b/client/AmneziaVPN/Images.xcassets/AppIcon.appiconset/icon_60x60.png deleted file mode 100644 index 0778ec28..00000000 Binary files a/client/AmneziaVPN/Images.xcassets/AppIcon.appiconset/icon_60x60.png and /dev/null differ diff --git a/client/AmneziaVPN/Images.xcassets/AppIcon.appiconset/icon_80x80.png b/client/AmneziaVPN/Images.xcassets/AppIcon.appiconset/icon_80x80.png deleted file mode 100644 index 8a1fdc1d..00000000 Binary files a/client/AmneziaVPN/Images.xcassets/AppIcon.appiconset/icon_80x80.png and /dev/null differ diff --git a/client/AmneziaVPN/Images.xcassets/AppIcon.appiconset/icon_87x87.png b/client/AmneziaVPN/Images.xcassets/AppIcon.appiconset/icon_87x87.png deleted file mode 100644 index e57c6fbb..00000000 Binary files a/client/AmneziaVPN/Images.xcassets/AppIcon.appiconset/icon_87x87.png and /dev/null differ diff --git a/client/AmneziaVPN/Images.xcassets/Contents.json b/client/AmneziaVPN/Images.xcassets/Contents.json deleted file mode 100644 index 73c00596..00000000 --- a/client/AmneziaVPN/Images.xcassets/Contents.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/client/fastlane/report.xml b/client/fastlane/report.xml index 279b432b..760f5e96 100644 --- a/client/fastlane/report.xml +++ b/client/fastlane/report.xml @@ -5,52 +5,52 @@ - + - + - + - + - + - + - + - + - + - + diff --git a/client/ios/app/Info.plist b/client/ios/app/Info.plist index 73a71c11..f1065cbe 100644 --- a/client/ios/app/Info.plist +++ b/client/ios/app/Info.plist @@ -25,7 +25,7 @@ CFBundleShortVersionString $(MARKETING_VERSION) CFBundleVersion - 3 + 5 ITSAppUsesNonExemptEncryption LSRequiresIPhoneOS diff --git a/client/macos/networkextension/Info.plist b/client/macos/networkextension/Info.plist index b19b1255..64bee284 100644 --- a/client/macos/networkextension/Info.plist +++ b/client/macos/networkextension/Info.plist @@ -19,7 +19,7 @@ CFBundleShortVersionString $(MARKETING_VERSION) CFBundleVersion - 3 + 5 ITSAppUsesNonExemptEncryption LSMinimumSystemVersion diff --git a/client/scripts/ios_compile.sh b/client/scripts/ios_compile.sh index b1c11b3d..dfe67f89 100755 --- a/client/scripts/ios_compile.sh +++ b/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 \ diff --git a/client/scripts/xcode_patcher.rb b/client/scripts/xcode_patcher.rb index 56f85638..2fac5841 100644 --- a/client/scripts/xcode_patcher.rb +++ b/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) diff --git a/client/version.pri b/client/version.pri index 4611134d..68dc636d 100644 --- a/client/version.pri +++ b/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 diff --git a/client/versionfull.pri b/client/versionfull.pri new file mode 100644 index 00000000..bdfc533c --- /dev/null +++ b/client/versionfull.pri @@ -0,0 +1 @@ +!defined(BUILDVERSION, var):BUILDVERSION = 5 \ No newline at end of file