Skip to content

Commit

Permalink
Merge pull request #82 from hansemannn/master
Browse files Browse the repository at this point in the history
[MOD-2321] Bump versions, fix docs
  • Loading branch information
hansemannn authored Jan 24, 2017
2 parents be315f7 + df46fc2 commit 801db7b
Show file tree
Hide file tree
Showing 5 changed files with 13 additions and 8 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -43,3 +43,4 @@ android/launch-*
nbproject
ios/FacebookIOS.xcodeproj/project.xcworkspace/xcuserdata/
/android/java-sources.txt
/ios/metadata.json
4 changes: 2 additions & 2 deletions android/manifest
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@
# this is your module manifest and used by Titanium
# during compilation, packaging, distribution, etc.
#
version: 6.1.0
version: 6.2.0
apiversion: 3
architectures: armeabi-v7a x86
description: facebook
author: Mark Mokryn and Ashraf A. S. (Appcelerator)
license: Apache License Version 2.0
copyright: Copyright (c) 2014 by Mark Mokryn, Copyright (c) 2009-2016 by Appcelerator
copyright: Copyright (c) 2014 by Mark Mokryn, Copyright (c) 2009-2017 by Appcelerator
respackage: com.facebook

# these should not be edited
Expand Down
7 changes: 2 additions & 5 deletions apidoc/Facebook.yml
Original file line number Diff line number Diff line change
Expand Up @@ -895,7 +895,7 @@ methods:
summary: Log an app event that tracks that the application was open via Push Notification.
platforms: [android, iphone, ipad]
since: "6.1.0"
properties:
parameters:
- name: payload
summary: Notification payload received via in the push-notification callback.
type: Dictionary
Expand All @@ -909,7 +909,7 @@ methods:
summary: Sets a device token to register the current application installation for push notifications.
platforms: [iphone, ipad, android]
since: "6.1.0"
properties:
parameters:
- name: deviceToken
summary: Device-token received when registering for push-notifications.
type: String
Expand Down Expand Up @@ -2170,6 +2170,3 @@ properties:
summary: A string that contain the error.
type: String
optional: true



7 changes: 7 additions & 0 deletions ios/build.py
Original file line number Diff line number Diff line change
Expand Up @@ -230,6 +230,13 @@ def package_module(manifest,mf,config):


if __name__ == '__main__':
print "**************************************************************"
print " WARNING!"
print " This Python script is deprecated!"
print " Please use 'appc ti build -p ios --build-only' instead"
print "**************************************************************"
print ""

manifest,mf = validate_manifest()
validate_license()
config = read_ti_xcconfig()
Expand Down
2 changes: 1 addition & 1 deletion ios/manifest
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: 5.3.3
version: 5.4.0
apiversion: 2
description: Allows Facebook integration for Titanium apps
author: Mark Mokryn, Ng Chee Kiat and Hans Knoechel
Expand Down

0 comments on commit 801db7b

Please sign in to comment.