Skip to content

Commit

Permalink
Merge pull request #14 from cheekiatng/mod-2119
Browse files Browse the repository at this point in the history
[MOD-2119] Changed minsdk for Facebook module to 4.0.0
  • Loading branch information
cheekiatng committed Apr 22, 2015
2 parents d6755f4 + dc8b667 commit 43d1b88
Show file tree
Hide file tree
Showing 7 changed files with 30 additions and 11 deletions.
12 changes: 12 additions & 0 deletions History.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,15 @@
#### 4.0.3
- change minsdk to 4.0.0 [MOD-2119]

#### 4.0.2
- Updated Facebook SDK from 3.21.1 to 3.23.1 [TIMOB-18712]
- Exposed data returned on presentSendRequestDialog
- Bumped iOS module version to be same as android
- Fixed `requestNewReadPermissions` and the `LikeButton` in Android [MOD-2105]

#### 4.0.1
- Changing sessionDefaultAudence to audience in Android [MOD-2107]

#### 4.0.0
- Combined and updated the Facebook module from https://github.com/mokesmokes/titanium-android-facebook/ and https://github.com/mokesmokes/titanium-ios-facebook

Expand Down
4 changes: 3 additions & 1 deletion android/documentation/changelog.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
# Change Log
<pre>
v4.0.2 Fixed `requestNewReadPermissions` and the `LikeButton` in Android [MOD-2105]
v4.0.3 changed minsdk to 4.0.0 [mod-2119]

v4.0.2 Fixed `requestNewReadPermissions` and the `LikeButton` in Android [MOD-2105], Exposed data returned on presentSendRequestDialog [TIMOB-18712]

v4.0.1 Changing sessionDefaultAudence to audience in Android [MOD-2107]

Expand Down
4 changes: 2 additions & 2 deletions android/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: 4.0.2
version: 4.0.3
apiversion: 2
architectures: armeabi armeabi-v7a x86
description: facebook
Expand All @@ -16,4 +16,4 @@ name: Facebook
moduleid: facebook
guid: e4f7ac61-1ee7-44c5-bc27-fa6876e2dce9
platform: android
minsdk: 3.5.1
minsdk: 4.0.0
11 changes: 8 additions & 3 deletions documentation/changelog.md
Original file line number Diff line number Diff line change
@@ -1,8 +1,13 @@
# Change Log
<pre>
v.4.0.2 Updated Facebook SDK from 3.21.1 to 3.23.1
Exposed data returned on presentSendRequestDialog
Bumped iOS module version to be same as android
v4.0.3 changed minsdk to 4.0.0 [mod-2119]

v4.0.2 Updated Facebook SDK from 3.21.1 to 3.23.1
Exposed data returned on presentSendRequestDialog
Bumped iOS module version to be same as android
Fixed `requestNewReadPermissions` and the `LikeButton` in Android [MOD-2105]

v4.0.1 Changing sessionDefaultAudence to audience in Android [MOD-2107]

v4.0.0 Combined and updated the Facebook module from https://github.com/mokesmokes/titanium-android-facebook/ and https://github.com/mokesmokes/titanium-ios-facebook

Expand Down
4 changes: 2 additions & 2 deletions 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: 4.0.2
version: 4.0.3
apiversion: 2
description: Allows facebook integration for Titanium apps
author: Mark Mokryn and Ng Chee Kiat
Expand All @@ -14,5 +14,5 @@ name: Facebook
moduleid: facebook
guid: da8acc57-8673-4692-9282-e3c1a21f5d83
platform: iphone
minsdk: 3.5.1
minsdk: 4.0.0
architectures: armv7 arm64 i386 x86_64
2 changes: 1 addition & 1 deletion ios/module.xcconfig
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

//
// How to add a Framework (example)
FRAMEWORK_SEARCH_PATHS=$(SRCROOT)/../../modules/iphone/facebook/4.0.0/platform "~/Library/Application Support/Titanium/modules/iphone/facebook/4.0.0/platform"
FRAMEWORK_SEARCH_PATHS=$(SRCROOT)/../../modules/iphone/facebook/4.0.3/platform "~/Library/Application Support/Titanium/modules/iphone/facebook/4.0.3/platform"
OTHER_LDFLAGS=$(inherited) -framework Social -framework FacebookSDK
//
// OTHER_LDFLAGS=$(inherited) -framework Foo
Expand Down
4 changes: 2 additions & 2 deletions ios/titanium.xcconfig
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@
// OF YOUR TITANIUM SDK YOU'RE BUILDING FOR
//
//
TITANIUM_SDK_VERSION = 3.5.1.GA
TITANIUM_SDK_VERSION = 4.0.0


//
// THESE SHOULD BE OK GENERALLY AS-IS
//
TITANIUM_SDK = ~/Library/Application Support/Titanium/mobilesdk/osx/3.5.1.GA
TITANIUM_SDK = ~/Library/Application Support/Titanium/mobilesdk/osx/4.0.0
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

1 comment on commit 43d1b88

@kosso
Copy link

@kosso kosso commented on 43d1b88 May 26, 2015

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is platform 4.0.0+ now an absolute requirement of using the Facebook module in our apps now?

Please sign in to comment.