Merge pull request #32 from mym0404/ios-static-framework

mym0404 · web-flow · commit c70328cdbe17 · 2024-05-18T14:24:08.000+09:00
Support ios static framework build
diff --git a/example/package.json b/example/package.json
@@ -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",
@@ -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"
diff --git a/package.json b/package.json
@@ -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",
@@ -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",
diff --git a/packages/channel/ios/RNCKakaoChannel.mm b/packages/channel/ios/RNCKakaoChannel.mm
@@ -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
 
diff --git a/packages/channel/package.json b/packages/channel/package.json
@@ -112,5 +112,6 @@
   },
   "dependencies": {
     "@mj-studio/js-util": "^1.0.34"
-  }
+  },
+  "gitHead": "5ca9177f7ac369140ffb58d3c1285c2e5c96057d"
 }
diff --git a/packages/core/ios/RNCKakaoCore.mm b/packages/core/ios/RNCKakaoCore.mm
@@ -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
 
diff --git a/packages/core/package.json b/packages/core/package.json
@@ -139,7 +139,7 @@
       "map": "2.10.3"
     }
   },
-  "gitHead": "57203ed1725b209e814da7cfbb71b36f52d24210",
+  "gitHead": "5ca9177f7ac369140ffb58d3c1285c2e5c96057d",
   "dependencies": {
     "crypto-js": "^4.2.0",
     "query-string": "^9.0.0",
diff --git a/packages/map/ios/Component/Map/RNCKakaoMapView.h b/packages/map/ios/Component/Map/RNCKakaoMapView.h
@@ -6,7 +6,6 @@
 //
 
 #import "RCTFabricComponentsPlugins.h"
-#import "Util.h"
 #import <KakaoMapsSDK/KakaoMapsSDK-Swift.h>
 #import <KakaoMapsSDK/KakaoMapsSDK.h>
 #import <React/RCTViewComponentView.h>
diff --git a/packages/map/ios/Component/Map/RNCKakaoMapView.mm b/packages/map/ios/Component/Map/RNCKakaoMapView.mm
@@ -6,6 +6,7 @@
 //
 
 #import "RNCKakaoMapView.h"
+#import "Util.h"
 
 using namespace facebook::react;
 
diff --git a/packages/map/package.json b/packages/map/package.json
@@ -112,5 +112,6 @@
   },
   "dependencies": {
     "@mj-studio/js-util": "1.1.3"
-  }
+  },
+  "gitHead": "5ca9177f7ac369140ffb58d3c1285c2e5c96057d"
 }
diff --git a/packages/navi/ios/RNCKakaoNavi.mm b/packages/navi/ios/RNCKakaoNavi.mm
@@ -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 {
diff --git a/packages/navi/package.json b/packages/navi/package.json
@@ -110,7 +110,7 @@
       "javaPackageName": "net.mjstudio.rnkakao.navi"
     }
   },
-  "gitHead": "57203ed1725b209e814da7cfbb71b36f52d24210",
+  "gitHead": "5ca9177f7ac369140ffb58d3c1285c2e5c96057d",
   "dependencies": {
     "@mj-studio/js-util": "1.1.3"
   }
diff --git a/packages/share/ios/RNCKakaoShare.mm b/packages/share/ios/RNCKakaoShare.mm
@@ -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
 
diff --git a/packages/share/package.json b/packages/share/package.json
@@ -108,7 +108,7 @@
       "javaPackageName": "net.mjstudio.rnkakao.share"
     }
   },
-  "gitHead": "57203ed1725b209e814da7cfbb71b36f52d24210",
+  "gitHead": "5ca9177f7ac369140ffb58d3c1285c2e5c96057d",
   "dependencies": {
     "@mj-studio/js-util": "1.1.3"
   }
diff --git a/packages/social/ios/RNCKakaoSocial.mm b/packages/social/ios/RNCKakaoSocial.mm
@@ -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
 
diff --git a/packages/social/package.json b/packages/social/package.json
@@ -112,7 +112,7 @@
       "javaPackageName": "net.mjstudio.rnkakao.social"
     }
   },
-  "gitHead": "57203ed1725b209e814da7cfbb71b36f52d24210",
+  "gitHead": "5ca9177f7ac369140ffb58d3c1285c2e5c96057d",
   "dependencies": {
     "@mj-studio/js-util": "1.1.3"
   }
diff --git a/packages/user/ios/RNCKakaoUser.mm b/packages/user/ios/RNCKakaoUser.mm
@@ -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
 
diff --git a/packages/user/ios/RNCKakaoUserUtil.mm b/packages/user/ios/RNCKakaoUserUtil.mm
@@ -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 {
diff --git a/packages/user/package.json b/packages/user/package.json
@@ -110,7 +110,7 @@
       "javaPackageName": "net.mjstudio.rnkakao.user"
     }
   },
-  "gitHead": "57203ed1725b209e814da7cfbb71b36f52d24210",
+  "gitHead": "5ca9177f7ac369140ffb58d3c1285c2e5c96057d",
   "dependencies": {
     "@mj-studio/js-util": "1.1.3"
   }
diff --git a/yarn.lock b/yarn.lock

Original file line number	Diff line number	Diff line change
`@@ -112,5 +112,6 @@`
`112`	`112`	`},`
`113`	`113`	`"dependencies": {`
`114`	`114`	`"@mj-studio/js-util": "^1.0.34"`
`115`		`- }`
	`115`	`+ },`
	`116`	`+ "gitHead": "5ca9177f7ac369140ffb58d3c1285c2e5c96057d"`
`116`	`117`	`}`
Original file line number	Diff line number	Diff line change
`@@ -139,7 +139,7 @@`
`139`	`139`	`"map": "2.10.3"`
`140`	`140`	`}`
`141`	`141`	`},`
`142`		`- "gitHead": "57203ed1725b209e814da7cfbb71b36f52d24210",`
	`142`	`+ "gitHead": "5ca9177f7ac369140ffb58d3c1285c2e5c96057d",`
`143`	`143`	`"dependencies": {`
`144`	`144`	`"crypto-js": "^4.2.0",`
`145`	`145`	`"query-string": "^9.0.0",`
Original file line number	Diff line number	Diff line change
`@@ -110,7 +110,7 @@`
`110`	`110`	`"javaPackageName": "net.mjstudio.rnkakao.navi"`
`111`	`111`	`}`
`112`	`112`	`},`
`113`		`- "gitHead": "57203ed1725b209e814da7cfbb71b36f52d24210",`
	`113`	`+ "gitHead": "5ca9177f7ac369140ffb58d3c1285c2e5c96057d",`
`114`	`114`	`"dependencies": {`
`115`	`115`	`"@mj-studio/js-util": "1.1.3"`
`116`	`116`	`}`
Original file line number	Diff line number	Diff line change
`@@ -108,7 +108,7 @@`
`108`	`108`	`"javaPackageName": "net.mjstudio.rnkakao.share"`
`109`	`109`	`}`
`110`	`110`	`},`
`111`		`- "gitHead": "57203ed1725b209e814da7cfbb71b36f52d24210",`
	`111`	`+ "gitHead": "5ca9177f7ac369140ffb58d3c1285c2e5c96057d",`
`112`	`112`	`"dependencies": {`
`113`	`113`	`"@mj-studio/js-util": "1.1.3"`
`114`	`114`	`}`
Original file line number	Diff line number	Diff line change
`@@ -112,7 +112,7 @@`
`112`	`112`	`"javaPackageName": "net.mjstudio.rnkakao.social"`
`113`	`113`	`}`
`114`	`114`	`},`
`115`		`- "gitHead": "57203ed1725b209e814da7cfbb71b36f52d24210",`
	`115`	`+ "gitHead": "5ca9177f7ac369140ffb58d3c1285c2e5c96057d",`
`116`	`116`	`"dependencies": {`
`117`	`117`	`"@mj-studio/js-util": "1.1.3"`
`118`	`118`	`}`