diff --git a/CHANGELOG.md b/CHANGELOG.md index 75fa92d..f851ded 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,6 @@ +### 2.2.0 +- macOS: Updated to FreSwift 5.1.0 + ### 2.1.0 - macOS: Updated to FreSwift 5.0.0 diff --git a/example/.idea/misc.xml b/example/.idea/misc.xml index fecce83..793a0b6 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 cc011a6..1beade5 100644 --- a/example/DesktopToastANESample.iml +++ b/example/DesktopToastANESample.iml @@ -15,7 +15,7 @@ - + @@ -43,14 +43,14 @@ - + - - + + \ No newline at end of file diff --git a/example/air_package.json b/example/air_package.json index da33fb9..3398080 100644 --- a/example/air_package.json +++ b/example/air_package.json @@ -1,6 +1,6 @@ { "name": "toast-sample", - "version": "2.1.0", + "version": "2.2.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.1.0" + "com.tuarua.DesktopToastANE": "2.2.0" } } diff --git a/example/src/Main-app.xml b/example/src/Main-app.xml index 468be53..fd46efb 100644 --- a/example/src/Main-app.xml +++ b/example/src/Main-app.xml @@ -1,10 +1,10 @@  - + com.tuarua.desktoptoastanesample DesktopToastANESample DesktopToastANESample - 2.0.0 + 2.2.0 diff --git a/native_extension/ane/air_package.json b/native_extension/ane/air_package.json index 1ad7939..09bba88 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.1.0", + "version": "2.2.0", "repository": { "url": "https://tuarua.github.io/air/air_packages.json" }, "dependencies": { - "com.tuarua.FreSwift": "5.0.0" + "com.tuarua.FreSwift": "5.1.0" } -} \ No newline at end of file +} diff --git a/native_extension/ane/build.sh b/native_extension/ane/build.sh index 1689aa9..35fe4b2 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_32" +AIR_SDK="/Users/eoinlandy/SDKs/AIRSDK_33.1.1.345" echo $AIR_SDK #Setup the directory. diff --git a/native_extension/ane/extension.xml b/native_extension/ane/extension.xml index 997b62a..50b0f67 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.1.0 + 2.2.0 diff --git a/native_library/mac/DesktopToastANE/Cartfile b/native_library/mac/DesktopToastANE/Cartfile index 61937dd..d4dc080 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.0.0/FreSwift.json" ~> 5.0.0 \ No newline at end of file +binary "https://github.com/tuarua/Swift-IOS-ANE/releases/download/5.1.0/FreSwift.json" ~> 5.1.0 \ 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 18c1aa1..2d984bc 100644 --- a/native_library/mac/DesktopToastANE/DesktopToastANE.xcodeproj/project.pbxproj +++ b/native_library/mac/DesktopToastANE/DesktopToastANE.xcodeproj/project.pbxproj @@ -223,6 +223,7 @@ 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"; @@ -287,6 +288,7 @@ 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"; @@ -345,6 +347,7 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = NO; + ARCHS = x86_64; CLANG_CXX_LANGUAGE_STANDARD = "compiler-default"; CLANG_CXX_LIBRARY = "compiler-default"; CLANG_ENABLE_MODULES = YES; @@ -356,7 +359,7 @@ DYLIB_CURRENT_VERSION = 1; DYLIB_INSTALL_NAME_BASE = "@rpath"; FRAMEWORK_SEARCH_PATHS = ( - /Users/eoinlandy/SDKs/AIRSDK_30/runtimes/air/mac, + /Users/eoinlandy/SDKs/AIRSDK_32/runtimes/air/mac, "$(PROJECT_DIR)/Carthage/Build/Mac", ); FRAMEWORK_VERSION = A; @@ -364,9 +367,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_30/runtimes/air/mac; + LIBRARY_SEARCH_PATHS = /Users/eoinlandy/SDKs/AIRSDK_32/runtimes/air/mac; MACOSX_DEPLOYMENT_TARGET = 10.10; - MARKETING_VERSION = 1.9.0; + MARKETING_VERSION = 2.2.0; OTHER_CFLAGS = ""; OTHER_LDFLAGS = ( "-weak_framework", @@ -387,6 +390,7 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = NO; + ARCHS = x86_64; CLANG_CXX_LANGUAGE_STANDARD = "compiler-default"; CLANG_CXX_LIBRARY = "compiler-default"; CLANG_ENABLE_MODULES = YES; @@ -398,7 +402,7 @@ DYLIB_CURRENT_VERSION = 1; DYLIB_INSTALL_NAME_BASE = "@rpath"; FRAMEWORK_SEARCH_PATHS = ( - /Users/eoinlandy/SDKs/AIRSDK_30/runtimes/air/mac, + /Users/eoinlandy/SDKs/AIRSDK_32/runtimes/air/mac, "$(PROJECT_DIR)/Carthage/Build/Mac", ); FRAMEWORK_VERSION = A; @@ -406,9 +410,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_30/runtimes/air/mac; + LIBRARY_SEARCH_PATHS = /Users/eoinlandy/SDKs/AIRSDK_32/runtimes/air/mac; MACOSX_DEPLOYMENT_TARGET = 10.10; - MARKETING_VERSION = 1.9.0; + MARKETING_VERSION = 2.2.0; OTHER_CFLAGS = ""; OTHER_LDFLAGS = ( "-weak_framework",