feat: update app identifiers and development team for iOS and macOS builds
This commit is contained in:
parent
9dea98f020
commit
41b52e900c
7 changed files with 11 additions and 11 deletions
|
|
@ -148,13 +148,13 @@ if(APPLE)
|
||||||
cmake_policy(SET CMP0114 NEW)
|
cmake_policy(SET CMP0114 NEW)
|
||||||
|
|
||||||
if(NOT BUILD_OSX_APP_IDENTIFIER)
|
if(NOT BUILD_OSX_APP_IDENTIFIER)
|
||||||
set(BUILD_OSX_APP_IDENTIFIER org.amnezia.AmneziaVPN CACHE STRING "OSX Application identifier")
|
set(BUILD_OSX_APP_IDENTIFIER org.amneziaUnipessoal.DefaultVPN CACHE STRING "OSX Application identifier")
|
||||||
endif()
|
endif()
|
||||||
if(NOT BUILD_IOS_APP_IDENTIFIER)
|
if(NOT BUILD_IOS_APP_IDENTIFIER)
|
||||||
set(BUILD_IOS_APP_IDENTIFIER org.amnezia.AmneziaVPN CACHE STRING "iOS Application identifier")
|
set(BUILD_IOS_APP_IDENTIFIER org.amneziaUnipessoal.DefaultVPN CACHE STRING "iOS Application identifier")
|
||||||
endif()
|
endif()
|
||||||
if(NOT BUILD_IOS_GROUP_IDENTIFIER)
|
if(NOT BUILD_IOS_GROUP_IDENTIFIER)
|
||||||
set(BUILD_IOS_GROUP_IDENTIFIER group.org.amnezia.AmneziaVPN CACHE STRING "iOS Group identifier")
|
set(BUILD_IOS_GROUP_IDENTIFIER group.org.amneziaUnipessoal.DefaultVPN CACHE STRING "iOS Group identifier")
|
||||||
endif()
|
endif()
|
||||||
if(NOT BUILD_VPN_DEVELOPMENT_TEAM)
|
if(NOT BUILD_VPN_DEVELOPMENT_TEAM)
|
||||||
set(BUILD_VPN_DEVELOPMENT_TEAM X7UJ388FXK CACHE STRING "Amnezia VPN Development Team")
|
set(BUILD_VPN_DEVELOPMENT_TEAM X7UJ388FXK CACHE STRING "Amnezia VPN Development Team")
|
||||||
|
|
|
||||||
|
|
@ -86,7 +86,7 @@ set_target_properties(${PROJECT} PROPERTIES
|
||||||
XCODE_ATTRIBUTE_SWIFT_OBJC_INTEROP_MODE "objcxx"
|
XCODE_ATTRIBUTE_SWIFT_OBJC_INTEROP_MODE "objcxx"
|
||||||
)
|
)
|
||||||
set_target_properties(${PROJECT} PROPERTIES
|
set_target_properties(${PROJECT} PROPERTIES
|
||||||
XCODE_ATTRIBUTE_DEVELOPMENT_TEAM "X7UJ388FXK"
|
XCODE_ATTRIBUTE_DEVELOPMENT_TEAM "GBN9N55CGR"
|
||||||
)
|
)
|
||||||
target_include_directories(${PROJECT} PRIVATE ${CMAKE_CURRENT_LIST_DIR})
|
target_include_directories(${PROJECT} PRIVATE ${CMAKE_CURRENT_LIST_DIR})
|
||||||
target_compile_options(${PROJECT} PRIVATE
|
target_compile_options(${PROJECT} PRIVATE
|
||||||
|
|
|
||||||
|
|
@ -8,13 +8,13 @@
|
||||||
</array>
|
</array>
|
||||||
<key>com.apple.security.application-groups</key>
|
<key>com.apple.security.application-groups</key>
|
||||||
<array>
|
<array>
|
||||||
<string>group.org.amnezia.AmneziaVPN</string>
|
<string>group.org.amneziaUnipessoal.DefaultVPN</string>
|
||||||
</array>
|
</array>
|
||||||
<key>com.apple.security.files.user-selected.read-write</key>
|
<key>com.apple.security.files.user-selected.read-write</key>
|
||||||
<true/>
|
<true/>
|
||||||
<key>keychain-access-groups</key>
|
<key>keychain-access-groups</key>
|
||||||
<array>
|
<array>
|
||||||
<string>$(AppIdentifierPrefix)group.org.amnezia.AmneziaVPN</string>
|
<string>$(AppIdentifierPrefix)group.org.amneziaUnipessoal.DefaultVPN</string>
|
||||||
</array>
|
</array>
|
||||||
</dict>
|
</dict>
|
||||||
</plist>
|
</plist>
|
||||||
|
|
|
||||||
|
|
@ -8,11 +8,11 @@
|
||||||
</array>
|
</array>
|
||||||
<key>com.apple.security.application-groups</key>
|
<key>com.apple.security.application-groups</key>
|
||||||
<array>
|
<array>
|
||||||
<string>group.org.amnezia.AmneziaVPN</string>
|
<string>group.org.amneziaUnipessoal.DefaultVPN</string>
|
||||||
</array>
|
</array>
|
||||||
<key>keychain-access-groups</key>
|
<key>keychain-access-groups</key>
|
||||||
<array>
|
<array>
|
||||||
<string>$(AppIdentifierPrefix)group.org.amnezia.AmneziaVPN</string>
|
<string>$(AppIdentifierPrefix)group.org.amneziaUnipessoal.DefaultVPN</string>
|
||||||
</array>
|
</array>
|
||||||
</dict>
|
</dict>
|
||||||
</plist>
|
</plist>
|
||||||
|
|
|
||||||
|
|
@ -39,7 +39,7 @@ set_target_properties(networkextension PROPERTIES
|
||||||
)
|
)
|
||||||
|
|
||||||
set_target_properties("networkextension" PROPERTIES
|
set_target_properties("networkextension" PROPERTIES
|
||||||
XCODE_ATTRIBUTE_DEVELOPMENT_TEAM "X7UJ388FXK"
|
XCODE_ATTRIBUTE_DEVELOPMENT_TEAM "GBN9N55CGR"
|
||||||
)
|
)
|
||||||
|
|
||||||
find_library(FW_ASSETS_LIBRARY AssetsLibrary)
|
find_library(FW_ASSETS_LIBRARY AssetsLibrary)
|
||||||
|
|
|
||||||
|
|
@ -14,7 +14,7 @@ struct Log {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private static let appGroupID = "group.org.amnezia.AmneziaVPN"
|
private static let appGroupID = "group.org.amneziaUnipessoal.DefaultVPN"
|
||||||
|
|
||||||
static let appLogURL = {
|
static let appLogURL = {
|
||||||
let sharedContainerURL = FileManager.default.containerURL(forSecurityApplicationGroupIdentifier: appGroupID)!
|
let sharedContainerURL = FileManager.default.containerURL(forSecurityApplicationGroupIdentifier: appGroupID)!
|
||||||
|
|
|
||||||
|
|
@ -21,7 +21,7 @@ NSString* MacOSUtils::appId() {
|
||||||
if (!appId) {
|
if (!appId) {
|
||||||
// Fallback. When an unsigned/un-notarized app is executed in
|
// Fallback. When an unsigned/un-notarized app is executed in
|
||||||
// command-line mode, it could fail the fetching of its own bundle id.
|
// command-line mode, it could fail the fetching of its own bundle id.
|
||||||
appId = @"org.amnezia.AmneziaVPN";
|
appId = @"org.amneziaUnipessoal.DefaultVPN";
|
||||||
}
|
}
|
||||||
|
|
||||||
return appId;
|
return appId;
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue