Skip to content
Permalink
Browse files

Merge pull request #146 in EXTENSIONS/safari-app-extension from misc-…

…fix to master

* commit '423e68300815bf690c0edd26574708ec01766290':
  small fix
  small fix
  small fix
  small fix
  small fix
  small fix
  v1.3.3
  v1.3.3
  v1.3.2
  v1.3.2
  • Loading branch information...
Dmitry Kolyshev
Dmitry Kolyshev committed Jun 11, 2019
2 parents b24bd1e + 423e683 commit 3fac7d0cbbcf8aa462cf2952e7ba69bdc00a059b
@@ -1723,7 +1723,6 @@
"@executable_path/../Frameworks",
"@executable_path/../../../../Frameworks",
);
MACOSX_DEPLOYMENT_TARGET = 10.13;
MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
MTL_FAST_MATH = YES;
PRODUCT_BUNDLE_IDENTIFIER = "$(AG_ADVANCED_BLOCKING_BUNDLEID)";
@@ -1753,7 +1752,6 @@
"@executable_path/../Frameworks",
"@executable_path/../../../../Frameworks",
);
MACOSX_DEPLOYMENT_TARGET = 10.13;
MTL_FAST_MATH = YES;
PRODUCT_BUNDLE_IDENTIFIER = "$(AG_ADVANCED_BLOCKING_BUNDLEID)";
PRODUCT_NAME = "$(TARGET_NAME)";
@@ -1949,7 +1947,6 @@
"@executable_path/../Frameworks",
"@executable_path/../../../../Frameworks",
);
MACOSX_DEPLOYMENT_TARGET = 10.13;
MTL_FAST_MATH = YES;
"OTHER_CODE_SIGN_FLAGS[sdk=*]" = "--timestamp";
PRODUCT_BUNDLE_IDENTIFIER = "$(AG_ADVANCED_BLOCKING_BUNDLEID)";
@@ -1976,7 +1973,6 @@
"@executable_path/../Frameworks",
"@loader_path/../Frameworks",
);
MACOSX_DEPLOYMENT_TARGET = 10.13;
MTL_FAST_MATH = YES;
PRODUCT_BUNDLE_IDENTIFIER = mizzick.AdvancedBlockingUnitTests;
PRODUCT_NAME = "$(TARGET_NAME)";
@@ -2169,7 +2165,6 @@
"@executable_path/../Frameworks",
"@executable_path/../../../../Frameworks",
);
MACOSX_DEPLOYMENT_TARGET = 10.13;
MTL_FAST_MATH = YES;
"OTHER_CODE_SIGN_FLAGS[sdk=*]" = "--timestamp";
PRODUCT_BUNDLE_IDENTIFIER = "$(AG_ADVANCED_BLOCKING_BUNDLEID)";
@@ -2196,7 +2191,6 @@
"@executable_path/../Frameworks",
"@loader_path/../Frameworks",
);
MACOSX_DEPLOYMENT_TARGET = 10.13;
MTL_FAST_MATH = YES;
PRODUCT_BUNDLE_IDENTIFIER = mizzick.AdvancedBlockingUnitTests;
PRODUCT_NAME = "$(TARGET_NAME)";
@@ -2219,7 +2213,6 @@
"@executable_path/../Frameworks",
"@loader_path/../Frameworks",
);
MACOSX_DEPLOYMENT_TARGET = 10.13;
MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
MTL_FAST_MATH = YES;
PRODUCT_BUNDLE_IDENTIFIER = mizzick.AdvancedBlockingUnitTests;
@@ -2243,7 +2236,6 @@
"@executable_path/../Frameworks",
"@loader_path/../Frameworks",
);
MACOSX_DEPLOYMENT_TARGET = 10.13;
MTL_FAST_MATH = YES;
PRODUCT_BUNDLE_IDENTIFIER = mizzick.AdvancedBlockingUnitTests;
PRODUCT_NAME = "$(TARGET_NAME)";
@@ -2,13 +2,13 @@
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>com.apple.security.app-sandbox</key>
<true/>
<key>com.apple.security.application-groups</key>
<array>
<string>$(AG_GROUP)</string>
</array>
<key>com.apple.security.network.client</key>
<true/>
<key>com.apple.security.cs.allow-unsigned-executable-memory</key>
<true/>
</dict>
</plist>
@@ -2,9 +2,9 @@
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>com.apple.security.app-sandbox</key>
<true/>
<key>com.apple.security.inherit</key>
<true/>
<key>com.apple.security.cs.allow-unsigned-executable-memory</key>
<true/>
</dict>
</plist>
@@ -2,7 +2,7 @@
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>com.apple.security.app-sandbox</key>
<true/>
<key>com.apple.security.cs.allow-unsigned-executable-memory</key>
<true/>
</dict>
</plist>
@@ -48,6 +48,6 @@
<key>NSHumanReadableCopyright</key>
<string>$(AG_COPYRIGHT)</string>
<key>NSHumanReadableDescription</key>
<string>This extension manages injected script and extended css rules.</string>
<string>This extension applies advanced blocking rules which are not supported by Safari Content Blocking API.</string>
</dict>
</plist>
@@ -7,7 +7,7 @@
*/

/* (No Comment) */
"NSHumanReadableDescription" = "This extension manages injected script and extended css rules.";
"NSHumanReadableDescription" = "Это расширение применяет дополнительные правила блокировки, которые не поддерживаются Safari Content Blocking API.";

/* Bundle display name */
"CFBundleDisplayName" = "AdGuard Advanced Blocking";
@@ -1,7 +1,7 @@
AG_COPYRIGHT = Copyright © 2019 Adguard Software Ltd. All rights reserved.
AG_NAME = AdGuard for Safari
AG_VERSION = 1.2.3
AG_BUILD = 11
AG_VERSION = 1.3.3
AG_BUILD = 15

AG_STANDALONE = false
AG_STANDALONE_BETA = false
@@ -73,11 +73,9 @@ APP="${TARGET_TEMP_DIR}/${PRODUCT_NAME}-${PACKAGER_PLATFORM}-${ARCH}/${PRODUCT_N
FRAMEWORKS="${APP}/Contents/Frameworks"

# Sign electron app
if [ ${AG_STANDALONE} == "true" ]; then
echo "Signing standalone build"
echo "Signing build"
#codesign --verbose --force --deep -o runtime --timestamp --sign "${CODE_SIGN_IDENTITY}" --entitlements "${AG_APP_ENT}" "$APP" || exit 1
electron-osx-sign "${APP}" --platform=${PLATFORM} --timestamp="" --type=distribution --hardened-runtime --identity="${CODE_SIGN_IDENTITY}" --entitlements="${AG_ELECTRON_CHILD_ENT}" || exit 1
fi

codesign --verbose --force --deep -o runtime --timestamp --sign "${CODE_SIGN_IDENTITY}" --entitlements "${AG_ELECTRON_CHILD_ENT}" "$FRAMEWORKS/Electron Framework.framework/Versions/A/Electron Framework" || exit 1
codesign --verbose --force --deep -o runtime --timestamp --sign "${CODE_SIGN_IDENTITY}" --entitlements "${AG_ELECTRON_CHILD_ENT}" "$FRAMEWORKS/Electron Framework.framework/Versions/A/Libraries/libffmpeg.dylib" || exit 1
@@ -1,7 +1,7 @@
AG_COPYRIGHT = Copyright © 2019 Adguard Software Ltd. All rights reserved.
AG_NAME = AdGuard for Safari
AG_VERSION = 1.3.1
AG_BUILD = 13
AG_VERSION = 1.3.3
AG_BUILD = 15

AG_STANDALONE = true
AG_STANDALONE_BETA = true
@@ -1,7 +1,7 @@
AG_COPYRIGHT = Copyright © 2019 Adguard Software Ltd. All rights reserved.
AG_NAME = AdGuard for Safari
AG_VERSION = 1.2.3
AG_BUILD = 11
AG_VERSION = 1.3.3
AG_BUILD = 15

AG_STANDALONE = true
AG_STANDALONE_BETA = false
@@ -288,7 +288,7 @@
"message": "Github"
},
"onboarding_safari_desc": {
"message": "Check the box next to \"AdGuard Safari Icon\" and \"AdGuard\" in Safari preferences"
"message": "Check the box next to \"AdGuard Safari Icon\", \"AdGuard Advanced Blocking\" and \"AdGuard\" in Safari preferences"
},
"onboarding_safari_btn": {
"message": "Open preferences"
@@ -290,7 +290,7 @@
"message": "Github"
},
"onboarding_safari_desc": {
"message": "\u041f\u043e\u0441\u0442\u0430\u0432\u044c\u0442\u0435 \u0433\u0430\u043b\u043e\u0447\u043a\u0438 \u043d\u0430\u043f\u0440\u043e\u0442\u0438\u0432 \"AdGuard Safari Icon\" \u0438 \"AdGuard\" \u0432 \u043d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0430\u0445 Safari"
"message": "Поставьте галочки напротив \"AdGuard Safari Icon\", \"AdGuard Advanced Blocking\" и \"AdGuard\" в настройках Safari"
},
"onboarding_safari_btn": {
"message": "\u041e\u0442\u043a\u0440\u044b\u0442\u044c \u043d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0438"
@@ -1,6 +1,6 @@
{
"name": "AdGuardSafariApp",
"version": "1.3.1",
"version": "1.3.3",
"description": "",
"main": "./main.js",
"repository": "github:AdguardTeam/AdGuardForSafari",
Binary file not shown.
@@ -180,7 +180,7 @@ sh SupportingScripts/localizations/import.sh .
Change `.` to path to your project if you not in the root.

## How to release standalone builds
- update version `Config.xcconfig` and `package.json`
- update version `package.json` and `AdGuard/standalone.xcconfig` or `AdGuard/standalone-beta.xcconfig`
- select xcode build configuration (Standalone-beta or Standalone)
- build apps
- notarize builds

0 comments on commit 3fac7d0

Please sign in to comment.
You can’t perform that action at this time.