From 168f3bf1335fa1d02c77632eb164b05a4b862667 Mon Sep 17 00:00:00 2001 From: Eoin Landy Date: Sun, 21 Nov 2021 16:44:48 +0000 Subject: [PATCH] 2.4.0 --- CHANGELOG.md | 4 +++ example/.idea/misc.xml | 2 +- example/DesktopToastANESample.iml | 4 +-- example/air_package.json | 4 +-- example/src/Main-app.xml | 2 +- native_extension/ane/air_package.json | 4 +-- native_extension/ane/build.sh | 2 +- native_extension/ane/extension.xml | 2 +- native_library/mac/DesktopToastANE/Cartfile | 2 +- .../DesktopToastANE.xcodeproj/project.pbxproj | 26 +++++++------------ 10 files changed, 25 insertions(+), 27 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9580955..6d18779 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,7 @@ +### 2.4.0 +- Updated to FreSwift 5.5.1 +- Support Apple Silicon M1 + ### 2.3.0 - macOS: Updated to FreSwift 5.2.0 diff --git a/example/.idea/misc.xml b/example/.idea/misc.xml index 793a0b6..216d023 100644 --- a/example/.idea/misc.xml +++ b/example/.idea/misc.xml @@ -1,6 +1,6 @@ - + \ No newline at end of file diff --git a/example/DesktopToastANESample.iml b/example/DesktopToastANESample.iml index ec78904..ab227df 100644 --- a/example/DesktopToastANESample.iml +++ b/example/DesktopToastANESample.iml @@ -15,7 +15,7 @@ - + @@ -43,7 +43,7 @@ - + diff --git a/example/air_package.json b/example/air_package.json index 5fe357e..b798cb9 100644 --- a/example/air_package.json +++ b/example/air_package.json @@ -1,6 +1,6 @@ { "name": "toast-sample", - "version": "2.3.0", + "version": "2.4.0", "appDescriptor": "src/Main-app.xml", "variables": { }, @@ -10,6 +10,6 @@ "url": "https://tuarua.github.io/air/air_packages.json" }, "dependencies": { - "com.tuarua.DesktopToastANE": "2.3.0" + "com.tuarua.DesktopToastANE": "2.4.0" } } diff --git a/example/src/Main-app.xml b/example/src/Main-app.xml index 478cba5..4fc1003 100644 --- a/example/src/Main-app.xml +++ b/example/src/Main-app.xml @@ -4,7 +4,7 @@ DesktopToastANESample DesktopToastANESample - 2.3.0 + 2.4.0 diff --git a/native_extension/ane/air_package.json b/native_extension/ane/air_package.json index 758f8b0..86d5ed2 100644 --- a/native_extension/ane/air_package.json +++ b/native_extension/ane/air_package.json @@ -1,10 +1,10 @@ { "name": "com.tuarua.DesktopToastANE", - "version": "2.3.0", + "version": "2.4.0", "repository": { "url": "https://tuarua.github.io/air/air_packages.json" }, "dependencies": { - "com.tuarua.FreSwift": "5.2.0" + "com.tuarua.FreSwift": "5.5.1" } } diff --git a/native_extension/ane/build.sh b/native_extension/ane/build.sh index d24a461..04f5275 100755 --- a/native_extension/ane/build.sh +++ b/native_extension/ane/build.sh @@ -8,7 +8,7 @@ echo $pathtome PROJECT_NAME=DesktopToastANE -AIR_SDK="/Users/eoinlandy/SDKs/AIRSDK_33.1.1.476" +AIR_SDK="/Users/eoinlandy/SDKs/AIRSDK_33.1.1.633" echo $AIR_SDK #Setup the directory. diff --git a/native_extension/ane/extension.xml b/native_extension/ane/extension.xml index 2c68a43..03b37fa 100644 --- a/native_extension/ane/extension.xml +++ b/native_extension/ane/extension.xml @@ -3,7 +3,7 @@ com.tuarua.DesktopToastANE Desktop Toast ANE This work is licensed under Apache License, Copyright (c) 2018 Tua Rua Ltd. - 2.3.0 + 2.4.0 diff --git a/native_library/mac/DesktopToastANE/Cartfile b/native_library/mac/DesktopToastANE/Cartfile index 18ff01b..0750900 100644 --- a/native_library/mac/DesktopToastANE/Cartfile +++ b/native_library/mac/DesktopToastANE/Cartfile @@ -1 +1 @@ -binary "https://github.com/tuarua/Swift-IOS-ANE/releases/download/5.2.0/FreSwift.json" ~> 5.2.0 \ No newline at end of file +binary "https://github.com/tuarua/Swift-IOS-ANE/releases/download/5.5.1/FreSwift.json" ~> 5.5.1 \ No newline at end of file diff --git a/native_library/mac/DesktopToastANE/DesktopToastANE.xcodeproj/project.pbxproj b/native_library/mac/DesktopToastANE/DesktopToastANE.xcodeproj/project.pbxproj index 510a8fa..5d9361b 100644 --- a/native_library/mac/DesktopToastANE/DesktopToastANE.xcodeproj/project.pbxproj +++ b/native_library/mac/DesktopToastANE/DesktopToastANE.xcodeproj/project.pbxproj @@ -13,7 +13,6 @@ 90B843D323523F660009FB87 /* SwiftController+NSUserNotificationCenterDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 90B843D223523F660009FB87 /* SwiftController+NSUserNotificationCenterDelegate.swift */; }; CE05BF0F1F657F120019899B /* FreMacros.h in Headers */ = {isa = PBXBuildFile; fileRef = CE05BF0E1F657F120019899B /* FreMacros.h */; }; CE05BF111F657F1F0019899B /* FreSwift.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CE05BF101F657F1F0019899B /* FreSwift.framework */; }; - CE36AF4D1DF47DBD003C224B /* Adobe AIR_64 in Frameworks */ = {isa = PBXBuildFile; fileRef = CE36AF4B1DF47DBD003C224B /* Adobe AIR_64 */; }; CE36AF4E1DF47DBD003C224B /* Adobe AIR in Frameworks */ = {isa = PBXBuildFile; fileRef = CE36AF4C1DF47DBD003C224B /* Adobe AIR */; }; CE36AF501DF47E4E003C224B /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CE36AF4F1DF47E4E003C224B /* Cocoa.framework */; }; CEE7AB121DF4D45D0047E083 /* SwiftController.swift in Sources */ = {isa = PBXBuildFile; fileRef = CEE7AB111DF4D45D0047E083 /* SwiftController.swift */; }; @@ -28,8 +27,7 @@ CE05BF101F657F1F0019899B /* FreSwift.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = FreSwift.framework; path = Carthage/Build/Mac/FreSwift.framework; sourceTree = ""; }; CE36AF401DF47B7B003C224B /* DesktopToastANE.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = DesktopToastANE.framework; sourceTree = BUILT_PRODUCTS_DIR; }; CE36AF441DF47B7C003C224B /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; - CE36AF4B1DF47DBD003C224B /* Adobe AIR_64 */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = "Adobe AIR_64"; path = "/Users/eoinlandy/SDKs/AIRSDK_32/runtimes/air-captive/mac/Adobe AIR.framework/Versions/1.0/Adobe AIR_64"; sourceTree = ""; }; - CE36AF4C1DF47DBD003C224B /* Adobe AIR */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = "Adobe AIR"; path = "/Users/eoinlandy/SDKs/AIRSDK_32/runtimes/air-captive/mac/Adobe AIR.framework/Versions/1.0/Adobe AIR"; sourceTree = ""; }; + CE36AF4C1DF47DBD003C224B /* Adobe AIR */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = "Adobe AIR"; path = "/Users/eoinlandy/SDKs/AIRSDK_33.1.1.633/runtimes/air-captive/mac/Adobe AIR.framework/Versions/1.0/Adobe AIR"; sourceTree = ""; }; CE36AF4F1DF47E4E003C224B /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = System/Library/Frameworks/Cocoa.framework; sourceTree = SDKROOT; }; CEE7AB111DF4D45D0047E083 /* SwiftController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SwiftController.swift; sourceTree = ""; }; /* End PBXFileReference section */ @@ -41,7 +39,6 @@ files = ( CE05BF111F657F1F0019899B /* FreSwift.framework in Frameworks */, CE36AF4E1DF47DBD003C224B /* Adobe AIR in Frameworks */, - CE36AF4D1DF47DBD003C224B /* Adobe AIR_64 in Frameworks */, CE36AF501DF47E4E003C224B /* Cocoa.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; @@ -100,7 +97,6 @@ isa = PBXGroup; children = ( CE05BF101F657F1F0019899B /* FreSwift.framework */, - CE36AF4B1DF47DBD003C224B /* Adobe AIR_64 */, CE36AF4C1DF47DBD003C224B /* Adobe AIR */, CE36AF4F1DF47E4E003C224B /* Cocoa.framework */, ); @@ -147,7 +143,7 @@ CE36AF371DF47B7B003C224B /* Project object */ = { isa = PBXProject; attributes = { - LastUpgradeCheck = 1250; + LastUpgradeCheck = 1310; ORGANIZATIONNAME = "Tua Rua Ltd"; TargetAttributes = { CE36AF3F1DF47B7B003C224B = { @@ -223,7 +219,6 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; - ARCHS = x86_64; CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES; CLANG_ANALYZER_NONNULL = YES; CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; @@ -288,7 +283,6 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; - ARCHS = x86_64; CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES; CLANG_ANALYZER_NONNULL = YES; CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; @@ -347,7 +341,7 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = NO; - ARCHS = x86_64; + ARCHS = "$(ARCHS_STANDARD)"; CLANG_CXX_LANGUAGE_STANDARD = "compiler-default"; CLANG_CXX_LIBRARY = "compiler-default"; CLANG_ENABLE_MODULES = YES; @@ -359,7 +353,7 @@ DYLIB_CURRENT_VERSION = 1; DYLIB_INSTALL_NAME_BASE = "@rpath"; FRAMEWORK_SEARCH_PATHS = ( - /Users/eoinlandy/SDKs/AIRSDK_32/runtimes/air/mac, + /Users/eoinlandy/SDKs/AIRSDK_33.1.1.633/runtimes/air/mac, "$(PROJECT_DIR)/Carthage/Build/Mac", ); FRAMEWORK_VERSION = A; @@ -367,9 +361,9 @@ INFOPLIST_FILE = DesktopToastANE/Info.plist; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks"; - LIBRARY_SEARCH_PATHS = /Users/eoinlandy/SDKs/AIRSDK_32/runtimes/air/mac; + LIBRARY_SEARCH_PATHS = /Users/eoinlandy/SDKs/AIRSDK_33.1.1.633/runtimes/air/mac; MACOSX_DEPLOYMENT_TARGET = 10.10; - MARKETING_VERSION = 2.3.0; + MARKETING_VERSION = 2.4.0; OTHER_CFLAGS = ""; OTHER_LDFLAGS = ( "-weak_framework", @@ -390,7 +384,7 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = NO; - ARCHS = x86_64; + ARCHS = "$(ARCHS_STANDARD)"; CLANG_CXX_LANGUAGE_STANDARD = "compiler-default"; CLANG_CXX_LIBRARY = "compiler-default"; CLANG_ENABLE_MODULES = YES; @@ -402,7 +396,7 @@ DYLIB_CURRENT_VERSION = 1; DYLIB_INSTALL_NAME_BASE = "@rpath"; FRAMEWORK_SEARCH_PATHS = ( - /Users/eoinlandy/SDKs/AIRSDK_32/runtimes/air/mac, + /Users/eoinlandy/SDKs/AIRSDK_33.1.1.633/runtimes/air/mac, "$(PROJECT_DIR)/Carthage/Build/Mac", ); FRAMEWORK_VERSION = A; @@ -410,9 +404,9 @@ INFOPLIST_FILE = DesktopToastANE/Info.plist; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks"; - LIBRARY_SEARCH_PATHS = /Users/eoinlandy/SDKs/AIRSDK_32/runtimes/air/mac; + LIBRARY_SEARCH_PATHS = /Users/eoinlandy/SDKs/AIRSDK_33.1.1.633/runtimes/air/mac; MACOSX_DEPLOYMENT_TARGET = 10.10; - MARKETING_VERSION = 2.3.0; + MARKETING_VERSION = 2.4.0; OTHER_CFLAGS = ""; OTHER_LDFLAGS = ( "-weak_framework",