Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
* develop:
  Xcode project file update
  Tested with Titanium SDK 3.4.0 bumped version to 1.1
  • Loading branch information
thevinchi committed Oct 3, 2014
2 parents bb7cbb4 + 9c7ee5e commit 82fc537
Show file tree
Hide file tree
Showing 10 changed files with 1,575 additions and 1,564 deletions.
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ Module has been tested with the following versions of the Titanium SDK:

- Titanium 3.2.1
- Titanium 3.3.0
- Titanium 3.4.0

## Installation ##

Expand Down
10 changes: 9 additions & 1 deletion iphone/Classes/ComLeftlanelabFirebaseModule.m
Original file line number Diff line number Diff line change
Expand Up @@ -433,7 +433,15 @@ -(id)on: (id)args
FirebaseHandle _handle = [self.gInstances[_url] observeEventType:_event andPreviousSiblingNameWithBlock:^(FDataSnapshot *_snapshot, NSString *_prevName)
{
// Execute [callback]
[_callback call:@[[self FDataSnapshotSpider:_snapshot], (_prevName ? _prevName : [NSNull alloc])] thisObject:nil];
[[NSOperationQueue mainQueue] addOperationWithBlock:^
{
[_callback call:@[[self FDataSnapshotSpider:_snapshot], (_prevName ? _prevName : [NSNull alloc])] thisObject:nil];
}];

/* dispatch_async(dispatch_get_main_queue(), ^{
[_callback call:@[[self FDataSnapshotSpider:_snapshot], (_prevName ? _prevName : [NSNull alloc])] thisObject:nil];
});
*/
}

// Execute [cancelCallback] callback
Expand Down
3,104 changes: 1,552 additions & 1,552 deletions iphone/Classes/ComLeftlanelabFirebaseModuleAssets.m

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -11,17 +11,17 @@
<key>IDESourceControlProjectOriginsDictionary</key>
<dict>
<key>C4A1CD79CC7FB3FF469040AFD65665E37D572A1C</key>
<string>ssh://l3-bitbucket/leftlanelab/com.leftlanelab.firebase.git</string>
<string>l3-github:LeftLaneLab/firebase-titanium.git</string>
</dict>
<key>IDESourceControlProjectPath</key>
<string>iphone/Firebase iOS Module.xcodeproj/project.xcworkspace</string>
<string>iphone/Firebase iOS Module.xcodeproj</string>
<key>IDESourceControlProjectRelativeInstallPathDictionary</key>
<dict>
<key>C4A1CD79CC7FB3FF469040AFD65665E37D572A1C</key>
<string>../../..</string>
</dict>
<key>IDESourceControlProjectURL</key>
<string>ssh://l3-bitbucket/leftlanelab/com.leftlanelab.firebase.git</string>
<string>l3-github:LeftLaneLab/firebase-titanium.git</string>
<key>IDESourceControlProjectVersion</key>
<integer>111</integer>
<key>IDESourceControlProjectWCCIdentifier</key>
Expand Down
1 change: 1 addition & 0 deletions iphone/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ Module has been tested with the following versions of the Titanium SDK:

- Titanium 3.2.1
- Titanium 3.3.0
- Titanium 3.4.0

## Installation ##

Expand Down
4 changes: 2 additions & 2 deletions iphone/assets/com.leftlanelab.firebase.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

// Load the [underscore] library (try for both test & studio environments)
try {var _ = require('com.leftlanelab.firebase.underscore')}
catch (err) {var _ = require('modules/com.leftlanelab.firebase/1.0.1/platform/iphone/com.leftlanelab.firebase.underscore');}
catch (err) {var _ = require('modules/com.leftlanelab.firebase/1.1/platform/iphone/com.leftlanelab.firebase.underscore');}

var _instances = {'Firebase':0, 'FirebaseQuery':0},
_firebase = false,
Expand Down Expand Up @@ -74,7 +74,7 @@ var Firebase = function (url)
*
******************************************************************************/
Firebase.prototype.id = 'com.leftlanelab.firebase';
Firebase.prototype.version = '1.0.1';
Firebase.prototype.version = '1.1';

/*
* Authenticates a Firebase client
Expand Down
1 change: 1 addition & 0 deletions iphone/documentation/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ Module has been tested with the following versions of the Titanium SDK:

- Titanium 3.2.1
- Titanium 3.3.0
- Titanium 3.4.0

## Installation ##

Expand Down
2 changes: 1 addition & 1 deletion iphone/manifest
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# during compilation, packaging, distribution, etc.
#

version: 1.0.1
version: 1.1
# Also update module.xcconfig

apiversion: 2
Expand Down
6 changes: 3 additions & 3 deletions iphone/module.xcconfig
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@
//
// IMPORTANT NOTE: always use $(inherited) in your overrides
//
FRAMEWORK_SEARCH_PATHS=$(SRCROOT)/../../modules/iphone/com.leftlanelab.firebase/1.0.1/platform
FRAMEWORK_SEARCH_PATHS=$(FRAMEWORK_SEARCH_PATHS) "/Library/Application Support/Titanium/modules/iphone/com.leftlanelab.firebase/1.0.1/platform"
FRAMEWORK_SEARCH_PATHS=$(FRAMEWORK_SEARCH_PATHS) "~/Library/Application Support/Titanium/modules/iphone/com.leftlanelab.firebase/1.0.1/platform"
FRAMEWORK_SEARCH_PATHS=$(SRCROOT)/../../modules/iphone/com.leftlanelab.firebase/1.1/platform
FRAMEWORK_SEARCH_PATHS=$(FRAMEWORK_SEARCH_PATHS) "/Library/Application Support/Titanium/modules/iphone/com.leftlanelab.firebase/1.1/platform"
FRAMEWORK_SEARCH_PATHS=$(FRAMEWORK_SEARCH_PATHS) "~/Library/Application Support/Titanium/modules/iphone/com.leftlanelab.firebase/1.1/platform"

OTHER_LDFLAGS=$(inherited) -dynamic -licucore -lc++ -framework CFNetwork -framework Security -framework SystemConfiguration -framework Firebase
4 changes: 2 additions & 2 deletions iphone/titanium.xcconfig
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@
// OF YOUR TITANIUM SDK YOU'RE BUILDING FOR
//
//
TITANIUM_SDK_VERSION = 3.3.0.GA
TITANIUM_SDK_VERSION = 3.4.0.GA

//
// THESE SHOULD BE OK GENERALLY AS-IS
//
TITANIUM_SDK = /Users/vstross/Library/Application Support/Titanium/mobilesdk/osx/3.3.0.GA
TITANIUM_SDK = /Users/vstross/Library/Application Support/Titanium/mobilesdk/osx/3.4.0.GA
TITANIUM_BASE_SDK = "$(TITANIUM_SDK)/iphone/include"
TITANIUM_BASE_SDK2 = "$(TITANIUM_SDK)/iphone/include/TiCore"
HEADER_SEARCH_PATHS= $(TITANIUM_BASE_SDK) $(TITANIUM_BASE_SDK2)
Expand Down

0 comments on commit 82fc537

Please sign in to comment.