Skip to content

Commit e3ec351

Browse files
committed
feat(share): fix android build
1 parent 4e02480 commit e3ec351

File tree

5 files changed

+16
-3
lines changed

5 files changed

+16
-3
lines changed

CONTRIBUTING.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,8 @@ The `package.json` file contains various scripts for common tasks:
4141
- `old`: convert example project to old architecture
4242
- `new:pod`: convert example project to new architecture with pod install
4343
- `old:pod`: convert example project to old architecture with pod install
44+
- `old:clean`: convert example project to old architecture with clean project, pod install
45+
- `new:clean`: convert example project to old architecture with clean project, pod install
4446

4547
**Codegen**
4648

package.json

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,8 @@
4444
"new:pod": "script/arch-convert.sh true true",
4545
"old": "script/arch-convert.sh false false",
4646
"new": "script/arch-convert.sh true false",
47+
"old:clean": "script/arch-convert.sh true false true",
48+
"new:clean": "script/arch-convert.sh true false true",
4749
"codegen:android": "cd example/android && ./gradlew generateCodegenArtifactsFromSchema",
4850
"codegen:ios": "node node_modules/react-native/scripts/generate-codegen-artifacts.js --path example/ --outputPath example/ios",
4951
"codegen": "yarn codegen:android && yarn codegen:ios"

packages/share/android/src/main/java/net/mjstudio/rnkakao/share/RNCKakaoShareModule.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ class RNCKakaoShareModule internal constructor(context: ReactApplicationContext)
1919

2020
@ReactMethod
2121
override fun shareCustom(
22-
templateId: Int,
22+
templateId: Double,
2323
useWebBrowserIfKakaoTalkNotAvailable: Boolean,
2424
templateArgs: ReadableMap?,
2525
serverCallbackArgs: ReadableMap?,

packages/share/android/src/oldarch/KakaoShareSpec.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import com.facebook.react.bridge.ReadableMap
88
abstract class KakaoShareSpec internal constructor(context: ReactApplicationContext) :
99
ReactContextBaseJavaModule(context) {
1010
abstract fun shareCustom(
11-
templateId: Int,
11+
templateId: Double,
1212
useWebBrowserIfKakaoTalkNotAvailable: Boolean,
1313
templateArgs: ReadableMap?,
1414
serverCallbackArgs: ReadableMap?,

script/arch-convert.sh

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ PROPERTY="newArchEnabled"
66
# New value from first command line argument
77
NEW_VALUE="$1"
88
POD="$2"
9+
CLEAN="$3"
910

1011
# Validate new value is either "true" or "false"
1112
if [ "${NEW_VALUE}" != "true" ] && [ "${NEW_VALUE}" != "false" ]; then
@@ -26,6 +27,10 @@ JSON="example/app.json"
2627
sed -i '' -e "s/\"newArchEnabled\": true/\"newArchEnabled\": ${NEW_VALUE}/g" $JSON
2728
sed -i '' -e "s/\"newArchEnabled\": false/\"newArchEnabled\": ${NEW_VALUE}/g" $JSON
2829

30+
if [[ $CLEAN == 'true' ]]; then
31+
yes | yarn gen:android:clean
32+
yes | yarn gen:ios:clean
33+
else
2934
yarn gen:android
3035
yarn gen:ios
3136

@@ -35,4 +40,8 @@ if [[ $NEW_VALUE == 'true' ]]; then
3540
else
3641
yarn pod:old
3742
fi
38-
fi
43+
fi
44+
fi
45+
46+
47+

0 commit comments

Comments
 (0)