Merge pull request #33 from nativium/update-djinni

update djinni and configurations
nativium · Feb 3, 2023 · 5f9e301 · 5f9e301
2 parents 47a59f4 + db7ce77
commit 5f9e301
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 8 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -166,7 +166,7 @@ if(NATIVIUM_TARGET STREQUAL "macos")
     set(CMAKE_OSX_DEPLOYMENT_TARGET "${NATIVIUM_DEPLOYMENT_TARGET}")
 
     set(DEVELOPMENT_TEAM_ID "" CACHE STRING "Development Team ID")
-    set(CODE_SIGN_IDENTITY "" CACHE STRING "Sign Identity")
+    set(CODE_SIGN_IDENTITY "-" CACHE STRING "Sign Identity")
 
     set(NATIVIUM_FRAMEWORK_LINKS_MACOS "-framework Foundation")
     set(NATIVIUM_FRAMEWORK_LINKS "${NATIVIUM_FRAMEWORK_LINKS} ${NATIVIUM_FRAMEWORK_LINKS_MACOS}" CACHE STRING "")
@@ -230,6 +230,7 @@ if(NATIVIUM_TARGET STREQUAL "ios")
         XCODE_ATTRIBUTE_CODE_SIGN_IDENTITY "${CODE_SIGN_IDENTITY}"
         XCODE_ATTRIBUTE_CODE_SIGNING_REQUIRED NO
         XCODE_ATTRIBUTE_DEVELOPMENT_TEAM "${DEVELOPMENT_TEAM_ID}"
+        XCODE_ATTRIBUTE_CODE_SIGN_STYLE "Manual"
         XCODE_ATTRIBUTE_TARGETED_DEVICE_FAMILY "${DEVICE_FAMILY}"
         XCODE_ATTRIBUTE_ONLY_ACTIVE_ARCH YES
         XCODE_ATTRIBUTE_SKIP_INSTALL NO
@@ -269,7 +270,9 @@ elseif(NATIVIUM_TARGET STREQUAL "macos")
         PROPERTIES
         # xcode
         XCODE_ATTRIBUTE_CODE_SIGN_IDENTITY "${CODE_SIGN_IDENTITY}"
+        XCODE_ATTRIBUTE_CODE_SIGNING_REQUIRED NO
         XCODE_ATTRIBUTE_DEVELOPMENT_TEAM "${DEVELOPMENT_TEAM_ID}"
+        XCODE_ATTRIBUTE_CODE_SIGN_STYLE "Manual"
         XCODE_ATTRIBUTE_ONLY_ACTIVE_ARCH YES
         XCODE_ATTRIBUTE_SKIP_INSTALL YES
         XCODE_ATTRIBUTE_CLANG_CXX_LIBRARY "libc++"

diff --git a/conan/profiles/nativium_macos_profile b/conan/profiles/nativium_macos_profile
@@ -2,5 +2,5 @@ include(default)
 
 [settings]
 os=Macos
-os.version=10.9
+os.version=10.13
 arch=x86_64
diff --git a/config/gluecode.py b/config/gluecode.py
@@ -1,7 +1,7 @@
 # -----------------------------------------------------------------------------
 def run(proj_path, params):
     return {
-        "version": "0.5.8",
+        "version": "0.5.9",
         "cpp_namespace_prefix": "nativium",
         "cpp_include_prefix": "nativium",
         "objc_prefix": "NTV",

diff --git a/docs/main/docs/apple.md b/docs/main/docs/apple.md
@@ -124,7 +124,7 @@ Some useful macros to check OS and execute specific code for that OS:
 
 or
 
-if #available(macOS 10.9, *) {
+if #available(macOS 10.13, *) {
   // compiles for OS X
 } else if #available(iOS 9, *) {
   // compiles for iOS
@@ -162,7 +162,7 @@ or
 
 or 
 
-if (@available(macOS 10.9, *)) {
+if (@available(macOS 10.13, *)) {
   // compiles for OS X
 } else if (@available(iOS 9, *)) {
   // compiles for iOS
@@ -174,7 +174,7 @@ if (@available(macOS 10.9, *)) {
 
 or
 
-if (@available(macOS 10.9, iOS 9, tvOS 11, watchOS 5, *)) {
+if (@available(macOS 10.13, iOS 9, tvOS 11, watchOS 5, *)) {
   // compiles for OS X and iOS and TV OS and Watch OS with specified versions
 }
 ```

diff --git a/targets/macos/config/target_config.py b/targets/macos/config/target_config.py
@@ -26,7 +26,7 @@ def run(proj_path, target_name, params):
                     "arch": "x86_64",
                     "conan_arch": "x86_64",
                     "conan_profile": "nativium_macos_profile",
-                    "min_version": "10.9",
+                    "min_version": "10.13",
                     "sdk": "macosx",
                 },
             ]

diff --git a/targets/tests/config/target_config.py b/targets/tests/config/target_config.py
@@ -59,7 +59,7 @@ def get_archs():
                         "arch": "x86_64",
                         "conan_arch": "x86_64",
                         "conan_profile": "nativium_macos_profile",
-                        "min_version": "10.9",
+                        "min_version": "10.13",
                     }
                 ]
             )