Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat(ios): macOS and xcframework support #50

Merged
merged 2 commits into from
Sep 15, 2020
Merged

feat(ios): macOS and xcframework support #50

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f2471c7
feat(ios): macOS and xcframework support
ewanharris Sep 10, 2020
600314b
build: update to a released 9.2.0 build
ewanharris Sep 14, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion Jenkinsfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ library 'pipeline-library'
buildModule {
// defaults:
// nodeVersion = '8.2.1' // Must have version set up on Jenkins master before it can be changed
sdkVersion = '9.0.0.v20200205142057'
sdkVersion = '9.2.0.v20200914000026'
npmPublish = false
// androidAPILevel = '23' // if changed, must install on build nodes
}
4 changes: 2 additions & 2 deletions ios/manifest
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# this is your module manifest and used by Titanium
# during compilation, packaging, distribution, etc.
#
version: 2.0.2
version: 3.0.0
apiversion: 2
architectures: armv7 i386 x86_64 arm64
description: Monitoring geo regions
Expand All @@ -16,4 +16,4 @@ name: geofence
moduleid: ti.geofence
guid: a2ed656c-026c-461e-bc0d-95e745ab10ae
platform: iphone
minsdk: 6.0.0.GA
minsdk: 9.2.0
12 changes: 5 additions & 7 deletions ios/titanium.xcconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,12 @@
// OF YOUR TITANIUM SDK YOU'RE BUILDING FOR
//
//
TITANIUM_SDK_VERSION = 9.0.0.v20200207114311
TITANIUM_SDK_VERSION = 9.2.0.v20200914000026


//
//
// THESE SHOULD BE OK GENERALLY AS-IS
//
TITANIUM_SDK = ~/Library/Application Support/Titanium/mobilesdk/osx/$(TITANIUM_SDK_VERSION)
TITANIUM_BASE_SDK = "$(TITANIUM_SDK)/iphone/include"
TITANIUM_BASE_SDK2 = "$(TITANIUM_SDK)/iphone/include/TiCore"
HEADER_SEARCH_PATHS= $(TITANIUM_BASE_SDK) $(TITANIUM_BASE_SDK2)
FRAMEWORK_SEARCH_PATHS = $(inherited) "$(TITANIUM_SDK)/iphone/Frameworks"
TITANIUM_SDK = /Users/$(USER)/Library/Application Support/Titanium/mobilesdk/osx/$(TITANIUM_SDK_VERSION)
HEADER_SEARCH_PATHS = $(inherited) "$(TITANIUM_SDK)/iphone/include"
FRAMEWORK_SEARCH_PATHS = $(inherited) "$(TITANIUM_SDK)/iphone/Frameworks/**"
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@titanium-sdk/ti.geofence",
"version": "4.0.0",
"version": "5.0.0",
"private": true,
"description": "Allows for battery friendly monitoring of geofences on a device.",
"scripts": {
Expand Down