diff --git a/CMakeLists.txt b/CMakeLists.txt index 273196de07..99090cf756 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -12,7 +12,7 @@ if(NOT (IS_MULTI_CONFIG OR DEFINED CMAKE_BUILD_TYPE)) message("Setting build type ${CMAKE_BUILD_TYPE}") endif() -project("Mozilla VPN" VERSION 2.18.0 LANGUAGES C CXX +project("Mozilla VPN" VERSION 2.18.1 LANGUAGES C CXX DESCRIPTION "Mozilla VPN" HOMEPAGE_URL "https://vpn.mozilla.org" ) diff --git a/ios/app/Images.xcassets/AppIcon-black.appiconset/Contents.json b/ios/app/Images.xcassets/AppIcon-black.appiconset/Contents.json new file mode 100644 index 0000000000..a28ae3b63d --- /dev/null +++ b/ios/app/Images.xcassets/AppIcon-black.appiconset/Contents.json @@ -0,0 +1,14 @@ +{ + "images" : [ + { + "filename" : "black-1024 1.png", + "idiom" : "universal", + "platform" : "ios", + "size" : "1024x1024" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/ios/app/Images.xcassets/AppIcon-black.appiconset/black-1024 1.png b/ios/app/Images.xcassets/AppIcon-black.appiconset/black-1024 1.png new file mode 100644 index 0000000000..da5c3150dc Binary files /dev/null and b/ios/app/Images.xcassets/AppIcon-black.appiconset/black-1024 1.png differ diff --git a/ios/app/Images.xcassets/AppIcon-green.appiconset/Contents.json b/ios/app/Images.xcassets/AppIcon-green.appiconset/Contents.json new file mode 100644 index 0000000000..f45074cdb1 --- /dev/null +++ b/ios/app/Images.xcassets/AppIcon-green.appiconset/Contents.json @@ -0,0 +1,14 @@ +{ + "images" : [ + { + "filename" : "green-1024 1.png", + "idiom" : "universal", + "platform" : "ios", + "size" : "1024x1024" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/ios/app/Images.xcassets/AppIcon-green.appiconset/green-1024 1.png b/ios/app/Images.xcassets/AppIcon-green.appiconset/green-1024 1.png new file mode 100644 index 0000000000..7f26c6b685 Binary files /dev/null and b/ios/app/Images.xcassets/AppIcon-green.appiconset/green-1024 1.png differ diff --git a/ios/app/Images.xcassets/AppIcon-light-violet.appiconset/Contents.json b/ios/app/Images.xcassets/AppIcon-light-violet.appiconset/Contents.json new file mode 100644 index 0000000000..56bdb41003 --- /dev/null +++ b/ios/app/Images.xcassets/AppIcon-light-violet.appiconset/Contents.json @@ -0,0 +1,14 @@ +{ + "images" : [ + { + "filename" : "light-violet-1024 1.png", + "idiom" : "universal", + "platform" : "ios", + "size" : "1024x1024" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/ios/app/Images.xcassets/AppIcon-light-violet.appiconset/light-violet-1024 1.png b/ios/app/Images.xcassets/AppIcon-light-violet.appiconset/light-violet-1024 1.png new file mode 100644 index 0000000000..38f8a34a08 Binary files /dev/null and b/ios/app/Images.xcassets/AppIcon-light-violet.appiconset/light-violet-1024 1.png differ diff --git a/ios/app/Images.xcassets/AppIcon-violet.appiconset/Contents.json b/ios/app/Images.xcassets/AppIcon-violet.appiconset/Contents.json new file mode 100644 index 0000000000..9cabf82178 --- /dev/null +++ b/ios/app/Images.xcassets/AppIcon-violet.appiconset/Contents.json @@ -0,0 +1,14 @@ +{ + "images" : [ + { + "filename" : "violet-1024 1.png", + "idiom" : "universal", + "platform" : "ios", + "size" : "1024x1024" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/ios/app/Images.xcassets/AppIcon-violet.appiconset/violet-1024 1.png b/ios/app/Images.xcassets/AppIcon-violet.appiconset/violet-1024 1.png new file mode 100644 index 0000000000..5e418fcc99 Binary files /dev/null and b/ios/app/Images.xcassets/AppIcon-violet.appiconset/violet-1024 1.png differ diff --git a/src/cmake/ios.cmake b/src/cmake/ios.cmake index 88b54579a0..1189837775 100644 --- a/src/cmake/ios.cmake +++ b/src/cmake/ios.cmake @@ -55,6 +55,7 @@ set_target_properties(mozillavpn PROPERTIES XCODE_ATTRIBUTE_PRODUCT_NAME "${PROJECT_NAME}" XCODE_GENERATE_SCHEME TRUE XCODE_ATTRIBUTE_ASSETCATALOG_COMPILER_APPICON_NAME "AppIcon" + XCODE_ATTRIBUTE_ASSETCATALOG_COMPILER_INCLUDE_ALL_APPICON_ASSETS "YES" # Required for this target to be added to the archive? XCODE_ATTRIBUTE_INSTALL_PATH "$(LOCAL_APPS_DIR)" XCODE_ATTRIBUTE_SKIP_INSTALL "NO" diff --git a/src/telemetry/metrics.yaml b/src/telemetry/metrics.yaml index 3727e6bab0..8ce8bca4a0 100644 --- a/src/telemetry/metrics.yaml +++ b/src/telemetry/metrics.yaml @@ -725,7 +725,7 @@ sample: bugs: - https://mozilla-hub.atlassian.net/browse/VPN-3743 data_reviews: - - TODO + - https://github.com/mozilla-mobile/mozilla-vpn-client/pull/5528#pullrequestreview-1262407370 data_sensitivity: - technical notification_emails: