Skip to content

Commit

Permalink
Merge pull request #32 from mym0404/ios-static-framework
Browse files Browse the repository at this point in the history
Support ios static framework build
  • Loading branch information
mym0404 authored May 18, 2024
2 parents 5ca9177 + cfe5dc3 commit c70328c
Show file tree
Hide file tree
Showing 19 changed files with 260 additions and 303 deletions.
8 changes: 4 additions & 4 deletions example/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,11 @@
"@mj-studio/js-util": "^1.0.34",
"@mj-studio/react-util": "^0.0.20",
"@react-native-styled-system/core": "~1.2.1",
"expo": "51.0.0-preview.10",
"expo": "~51.0.8",
"expo-constants": "16.0.1",
"expo-dev-client": "4.0.6",
"expo-dev-client": "~4.0.14",
"expo-linking": "6.3.1",
"expo-router": "3.5.4",
"expo-router": "~3.5.14",
"expo-status-bar": "1.12.1",
"react": "18.2.0",
"react-native": "0.74.1",
Expand All @@ -44,7 +44,7 @@
"@react-native/metro-config": "0.74.83",
"@react-native/typescript-config": "0.74.83",
"babel-plugin-module-resolver": "^5.0.0",
"expo-build-properties": "~0.12.0"
"expo-build-properties": "~0.12.1"
},
"engines": {
"node": ">=18"
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@
"lint": "yarn t",
"format": "yarn lefthook run format",
"clean": "lerna run clean",
"prepare": "husky",
"build": "lerna run prepack && yarn web:unlink-declarations",
"bump": "./script/version.sh",
"bump:prerelease": "./script/version-prerelease.sh",
Expand Down Expand Up @@ -75,6 +74,7 @@
"eslint": "8.57.0",
"eslint-plugin-jest": "^28.2.0",
"fs-extra": "^11.2.0",
"husky": "^9.0.11",
"jest": "^29.7.0",
"lefthook": "^1.6.10",
"prettier": "3.2.5",
Expand Down
4 changes: 4 additions & 0 deletions packages/channel/ios/RNCKakaoChannel.mm
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
#import "RNCKakaoChannel.h"
#if __has_include("RNCKakaoChannel-Swift.h")
#import "RNCKakaoChannel-Swift.h"
#else
#import <RNCKakaoChannel/RNCKakaoChannel-Swift.h>
#endif

@implementation RNCKakaoChannel

Expand Down
3 changes: 2 additions & 1 deletion packages/channel/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -112,5 +112,6 @@
},
"dependencies": {
"@mj-studio/js-util": "^1.0.34"
}
},
"gitHead": "5ca9177f7ac369140ffb58d3c1285c2e5c96057d"
}
4 changes: 4 additions & 0 deletions packages/core/ios/RNCKakaoCore.mm
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
#import "RNCKakaoCore.h"
#if __has_include("RNCKakaoCore-Swift.h")
#import "RNCKakaoCore-Swift.h"
#else
#import <RNCKakaoCore/RNCKakaoCore-Swift.h>
#endif

@implementation RNCKakaoCore

Expand Down
2 changes: 1 addition & 1 deletion packages/core/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@
"map": "2.10.3"
}
},
"gitHead": "57203ed1725b209e814da7cfbb71b36f52d24210",
"gitHead": "5ca9177f7ac369140ffb58d3c1285c2e5c96057d",
"dependencies": {
"crypto-js": "^4.2.0",
"query-string": "^9.0.0",
Expand Down
1 change: 0 additions & 1 deletion packages/map/ios/Component/Map/RNCKakaoMapView.h
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
//

#import "RCTFabricComponentsPlugins.h"
#import "Util.h"
#import <KakaoMapsSDK/KakaoMapsSDK-Swift.h>
#import <KakaoMapsSDK/KakaoMapsSDK.h>
#import <React/RCTViewComponentView.h>
Expand Down
1 change: 1 addition & 0 deletions packages/map/ios/Component/Map/RNCKakaoMapView.mm
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
//

#import "RNCKakaoMapView.h"
#import "Util.h"

using namespace facebook::react;

Expand Down
3 changes: 2 additions & 1 deletion packages/map/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -112,5 +112,6 @@
},
"dependencies": {
"@mj-studio/js-util": "1.1.3"
}
},
"gitHead": "5ca9177f7ac369140ffb58d3c1285c2e5c96057d"
}
5 changes: 4 additions & 1 deletion packages/navi/ios/RNCKakaoNavi.mm
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
#import "RNCKakaoNavi.h"
#if __has_include("RNCKakaoNavi-Swift.h")
#import "RNCKakaoNavi-Swift.h"

#else
#import <RNCKakaoNavi/RNCKakaoNavi-Swift.h>
#endif
@implementation RNCKakaoNavi

- (RNCKakaoNaviManager*)manager {
Expand Down
2 changes: 1 addition & 1 deletion packages/navi/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@
"javaPackageName": "net.mjstudio.rnkakao.navi"
}
},
"gitHead": "57203ed1725b209e814da7cfbb71b36f52d24210",
"gitHead": "5ca9177f7ac369140ffb58d3c1285c2e5c96057d",
"dependencies": {
"@mj-studio/js-util": "1.1.3"
}
Expand Down
4 changes: 4 additions & 0 deletions packages/share/ios/RNCKakaoShare.mm
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
#import "RNCKakaoShare.h"
#if __has_include("RNCKakaoShare-Swift.h")
#import "RNCKakaoShare-Swift.h"
#else
#import <RNCKakaoShare/RNCKakaoShare-Swift.h>
#endif

@implementation RNCKakaoShare

Expand Down
2 changes: 1 addition & 1 deletion packages/share/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@
"javaPackageName": "net.mjstudio.rnkakao.share"
}
},
"gitHead": "57203ed1725b209e814da7cfbb71b36f52d24210",
"gitHead": "5ca9177f7ac369140ffb58d3c1285c2e5c96057d",
"dependencies": {
"@mj-studio/js-util": "1.1.3"
}
Expand Down
5 changes: 5 additions & 0 deletions packages/social/ios/RNCKakaoSocial.mm
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
#import "RNCKakaoSocial.h"

#if __has_include("RNCKakaoSocial-Swift.h")
#import "RNCKakaoSocial-Swift.h"
#else
#import <RNCKakaoSocial/RNCKakaoSocial-Swift.h>
#endif

@implementation RNCKakaoSocial

Expand Down
2 changes: 1 addition & 1 deletion packages/social/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@
"javaPackageName": "net.mjstudio.rnkakao.social"
}
},
"gitHead": "57203ed1725b209e814da7cfbb71b36f52d24210",
"gitHead": "5ca9177f7ac369140ffb58d3c1285c2e5c96057d",
"dependencies": {
"@mj-studio/js-util": "1.1.3"
}
Expand Down
4 changes: 4 additions & 0 deletions packages/user/ios/RNCKakaoUser.mm
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
#import "RNCKakaoUser.h"
#if __has_include("RNCKakaoUser-Swift.h")
#import "RNCKakaoUser-Swift.h"
#else
#import <RNCKakaoUser/RNCKakaoUser-Swift.h>
#endif

@implementation RNCKakaoUser

Expand Down
4 changes: 4 additions & 0 deletions packages/user/ios/RNCKakaoUserUtil.mm
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,11 @@
//

#import "RNCKakaoUserUtil.h"
#if __has_include("RNCKakaoUser-Swift.h")
#import "RNCKakaoUser-Swift.h"
#else
#import <RNCKakaoUser/RNCKakaoUser-Swift.h>
#endif

@implementation RNCKakaoUserUtil
+ (BOOL)isKakaoTalkLoginUrl:(NSURL*)url {
Expand Down
2 changes: 1 addition & 1 deletion packages/user/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@
"javaPackageName": "net.mjstudio.rnkakao.user"
}
},
"gitHead": "57203ed1725b209e814da7cfbb71b36f52d24210",
"gitHead": "5ca9177f7ac369140ffb58d3c1285c2e5c96057d",
"dependencies": {
"@mj-studio/js-util": "1.1.3"
}
Expand Down
Loading

0 comments on commit c70328c

Please sign in to comment.