Skip to content

Commit 636736c

Browse files
graphtobinaryHayesGordon
authored andcommitted
fix: resolve kotlin compilation error in android build
1 parent 0997c66 commit 636736c

3 files changed

Lines changed: 101 additions & 101 deletions

File tree

android/src/main/java/com/rivereactnative/RiveReactNativeView.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -914,8 +914,8 @@ class RiveReactNativeView(private val context: ThemedReactContext) : FrameLayout
914914
ReadableType.Boolean -> result.add(this.getBoolean(i))
915915
ReadableType.Number -> result.add(this.getDouble(i))
916916
ReadableType.String -> result.add(this.getString(i))
917-
ReadableType.Map -> result.add(this.getMap(i).toMap())
918-
ReadableType.Array -> result.add(this.getArray(i).toList()) // Recursive conversion
917+
ReadableType.Map -> result.add(this.getMap(i)?.toMap())
918+
ReadableType.Array -> result.add(this.getArray(i)?.toList()) // Recursive conversion
919919
else -> throw IllegalArgumentException("Unsupported array type at index: $i")
920920
}
921921
}

android/src/main/java/com/rivereactnative/RiveReactNativeViewManager.kt

Lines changed: 29 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,10 @@ class RiveReactNativeViewManager : SimpleViewManager<RiveReactNativeView>() {
2525

2626
"play" -> {
2727
args?.let {
28-
val animationName = it.getString(0)
29-
val loopMode = it.getString(1)
30-
val direction = it.getString(2)
31-
val isStateMachine = it.getBoolean(3)
28+
val animationName = it.getString(0)!!
29+
val loopMode = it.getString(1)!!
30+
val direction = it.getString(2)!!
31+
val isStateMachine = it.getBoolean(3)!!
3232
view.run {
3333
val rnLoopMode = RNLoopMode.mapToRNLoopMode(loopMode)
3434
val rnDirection = RNDirection.mapToRNDirection(direction)
@@ -46,8 +46,8 @@ class RiveReactNativeViewManager : SimpleViewManager<RiveReactNativeView>() {
4646

4747
"fireState" -> {
4848
args?.let {
49-
val stateMachineName = it.getString(0)
50-
val inputName = it.getString(1)
49+
val stateMachineName = it.getString(0)!!
50+
val inputName = it.getString(1)!!
5151
view.run {
5252
fireState(stateMachineName, inputName)
5353
}
@@ -56,9 +56,9 @@ class RiveReactNativeViewManager : SimpleViewManager<RiveReactNativeView>() {
5656

5757
"setBooleanState" -> {
5858
args?.let {
59-
val stateMachineName = it.getString(0)
60-
val inputName = it.getString(1)
61-
val value = it.getBoolean(2)
59+
val stateMachineName = it.getString(0)!!
60+
val inputName = it.getString(1)!!
61+
val value = it.getBoolean(2)!!
6262
view.run {
6363
setBooleanState(stateMachineName, inputName, value)
6464
}
@@ -67,9 +67,9 @@ class RiveReactNativeViewManager : SimpleViewManager<RiveReactNativeView>() {
6767

6868
"setNumberState" -> {
6969
args?.let {
70-
val stateMachineName = it.getString(0)
71-
val inputName = it.getString(1)
72-
val value = it.getDouble(2)
70+
val stateMachineName = it.getString(0)!!
71+
val inputName = it.getString(1)!!
72+
val value = it.getDouble(2)!!
7373
view.run {
7474
setNumberState(stateMachineName, inputName, value.toFloat())
7575
}
@@ -78,8 +78,8 @@ class RiveReactNativeViewManager : SimpleViewManager<RiveReactNativeView>() {
7878

7979
"fireStateAtPath" -> {
8080
args?.let {
81-
val inputName = it.getString(0)
82-
val path = it.getString(1)
81+
val inputName = it.getString(0)!!
82+
val path = it.getString(1)!!
8383
view.run {
8484
fireStateAtPath(inputName, path)
8585
}
@@ -88,9 +88,9 @@ class RiveReactNativeViewManager : SimpleViewManager<RiveReactNativeView>() {
8888

8989
"setBooleanStateAtPath" -> {
9090
args?.let {
91-
val inputName = it.getString(0)
92-
val value = it.getBoolean(1)
93-
val path = it.getString(2)
91+
val inputName = it.getString(0)!!
92+
val value = it.getBoolean(1)!!
93+
val path = it.getString(2)!!
9494
view.run {
9595
setBooleanStateAtPath(inputName, value, path)
9696
}
@@ -99,9 +99,9 @@ class RiveReactNativeViewManager : SimpleViewManager<RiveReactNativeView>() {
9999

100100
"setNumberStateAtPath" -> {
101101
args?.let {
102-
val inputName = it.getString(0)
103-
val value = it.getDouble(1)
104-
val path = it.getString(2)
102+
val inputName = it.getString(0)!!
103+
val value = it.getDouble(1)!!
104+
val path = it.getString(2)!!
105105
view.run {
106106
setNumberStateAtPath(inputName, value.toFloat(), path)
107107
}
@@ -112,8 +112,8 @@ class RiveReactNativeViewManager : SimpleViewManager<RiveReactNativeView>() {
112112

113113
"touchBegan" -> {
114114
args?.let {
115-
val x: Double = it.getDouble(0)
116-
val y: Double = it.getDouble(1)
115+
val x: Double = it.getDouble(0)!!
116+
val y: Double = it.getDouble(1)!!
117117
view.run {
118118
this.touchBegan(x.toFloat(), y.toFloat())
119119
}
@@ -122,8 +122,8 @@ class RiveReactNativeViewManager : SimpleViewManager<RiveReactNativeView>() {
122122

123123
"touchEnded" -> {
124124
args?.let {
125-
val x: Double = it.getDouble(0)
126-
val y: Double = it.getDouble(1)
125+
val x: Double = it.getDouble(0)!!
126+
val y: Double = it.getDouble(1)!!
127127
view.run {
128128
this.touchEnded(x.toFloat(), y.toFloat())
129129
}
@@ -134,8 +134,8 @@ class RiveReactNativeViewManager : SimpleViewManager<RiveReactNativeView>() {
134134

135135
"setTextRunValue" -> {
136136
args?.let {
137-
val textRunName: String = it.getString(0)
138-
val textValue: String = it.getString(1)
137+
val textRunName: String = it.getString(0)!!
138+
val textValue: String = it.getString(1)!!
139139
view.run {
140140
this.setTextRunValue(textRunName, textValue)
141141
}
@@ -144,9 +144,9 @@ class RiveReactNativeViewManager : SimpleViewManager<RiveReactNativeView>() {
144144

145145
"setTextRunValueAtPath" -> {
146146
args?.let {
147-
val textRunName: String = it.getString(0)
148-
val textValue: String = it.getString(1)
149-
val path: String = it.getString(2)
147+
val textRunName: String = it.getString(0)!!
148+
val textValue: String = it.getString(1)!!
149+
val path: String = it.getString(2)!!
150150
view.run {
151151
this.setTextRunValueAtPath(textRunName, textValue, path)
152152
}

example/ios/Podfile.lock

Lines changed: 70 additions & 70 deletions
Original file line numberDiff line numberDiff line change
@@ -1647,10 +1647,10 @@ PODS:
16471647
- React-logger (= 0.76.7)
16481648
- React-perflogger (= 0.76.7)
16491649
- React-utils (= 0.76.7)
1650-
- rive-react-native (9.1.0):
1650+
- rive-react-native (9.2.1):
16511651
- React-Core
1652-
- RiveRuntime (= 6.7.2)
1653-
- RiveRuntime (6.7.2)
1652+
- RiveRuntime (= 6.7.4)
1653+
- RiveRuntime (6.7.4)
16541654
- RNCPicker (2.11.0):
16551655
- DoubleConversion
16561656
- glog
@@ -2098,92 +2098,92 @@ EXTERNAL SOURCES:
20982098
SPEC CHECKSUMS:
20992099
boost: 1dca942403ed9342f98334bf4c3621f011aa7946
21002100
DoubleConversion: f16ae600a246532c4020132d54af21d0ddb2a385
2101-
EXConstants: 0472d3c23d97943fe3505306daf9cde8024365c2
2102-
Expo: f1d13d22815979ad85a0a59fcf6d23660c813ecd
2103-
ExpoAsset: a4cbc27a7cd24a6e87eb719603790b2cfa8dd326
2104-
ExpoBlur: 567af66164e3043a9a30069594aed1ddf0a88d97
2105-
ExpoFileSystem: 4d2e7f77a41cfde8c3ae98580d872cd49437f993
2106-
ExpoFont: 773955186469acc5108ff569712a2d243857475f
2107-
ExpoHaptics: e01cce0741d68c281853118eb0267f88d42c6b7a
2108-
ExpoHead: 3d555eb5d0d68c478b9ea259337686c58de22c71
2109-
ExpoKeepAwake: 2a5f15dd4964cba8002c9a36676319a3394c85c7
2110-
ExpoLinking: 0381341519ca7180a3a057d20edb1cf6a908aaf4
2111-
ExpoModulesCore: 561a787bc626ab9bcfee2a688bd588bf2667405f
2112-
ExpoSplashScreen: 643666b96a84e8d97d55fac43926fb4183c692d9
2113-
ExpoSymbols: b9f255ce49868d46a73f30e12859efeb8117bcad
2114-
ExpoSystemUI: ba4507df7d8d15f5e1694a3c7fc6bc3cca3803e5
2115-
ExpoWebBrowser: 6890a769e6c9d83da938dceb9a03e764afc3ec9c
2101+
EXConstants: 30c43b9ca8391c31bab9cc45c97f16eddcf11042
2102+
Expo: 63515728b6f238842dc95702eb0fb385f00d7c5a
2103+
ExpoAsset: 4033893dfb333b444bf45e951351254137b658d5
2104+
ExpoBlur: 392c1207f71d0ecf22371621c1fbd44ba84d9742
2105+
ExpoFileSystem: 2d804c73034c0d65eb2a640e0a77627033b69edc
2106+
ExpoFont: f354e926f8feae5e831ec8087f36652b44a0b188
2107+
ExpoHaptics: 8d199b2f33245ea85289ff6c954c7ee7c00a5b5d
2108+
ExpoHead: 5d1c5c20e3933db5d9ca349424cb3b9a4a84b706
2109+
ExpoKeepAwake: b0171a73665bfcefcfcc311742a72a956e6aa680
2110+
ExpoLinking: 8d12bee174ba0cdf31239706578e29e74a417402
2111+
ExpoModulesCore: 7f5e59799b89e5fad1d7cc6070744c1003ca320f
2112+
ExpoSplashScreen: 0f281e3c2ded4757d2309276c682d023c6299c77
2113+
ExpoSymbols: f3002db15156cd4e505c77b6ea1df5c984db9965
2114+
ExpoSystemUI: 2e5356d22b077c56c132b4dcbc5d69dd667b1f8c
2115+
ExpoWebBrowser: a212e6b480d8857d3e441fba51e0c968333803b3
21162116
FBLazyVector: ca8044c9df513671c85167838b4188791b6f37e1
21172117
fmt: 10c6e61f4be25dc963c36bd73fc7b1705fe975be
21182118
glog: 08b301085f15bcbb6ff8632a8ebaf239aae04e6a
21192119
hermes-engine: eb4a80f6bf578536c58a44198ec93a30f6e69218
2120-
RCT-Folly: bf5c0376ffe4dd2cf438dcf86db385df9fdce648
2120+
RCT-Folly: 84578c8756030547307e4572ab1947de1685c599
21212121
RCTDeprecation: 7691283dd69fed46f6653d376de6fa83aaad774c
21222122
RCTRequired: eac044a04629288f272ee6706e31f81f3a2b4bfe
21232123
RCTTypeSafety: cfe499e127eda6dd46e5080e12d80d0bfe667228
21242124
React: 1f3737a983fdd26fb3d388ddbca41a26950fe929
21252125
React-callinvoker: 5c15ac628eab5468fe0b4dc453495f4742761f00
2126-
React-Core: 4b90a977a5b2777fd8f4a8db7325a83431ecd2d8
2127-
React-CoreModules: 385bbacfa34ac9208aa24f239a5184fa7ab1cd28
2128-
React-cxxreact: 3e09bcdf1f86b931b5e96bf5429d7c274a0ec168
2126+
React-Core: e467bf49f10da6fe92d915d2311cd0fd9bfbe052
2127+
React-CoreModules: 0299b3c0782edd3b37c8445ba07bf18ceb73812d
2128+
React-cxxreact: 54e253030b3b82b05575f19a1fb0e25c049f30ba
21292129
React-debug: 2086b55a5e55fb0abae58c42b8f280ebd708c956
2130-
React-defaultsnativemodule: 491e2541856e3580dae7f29d80754673a2134e48
2131-
React-domnativemodule: 4aaed5d5eef3da7d7d49b1f2ae8f422a4d7794b7
2132-
React-Fabric: 5b8373d1bd34bf269b13529a0ebee0643165ccf8
2133-
React-FabricComponents: 3f8528c3ed060464a120e161ffaef9307a88817b
2134-
React-FabricImage: 8efa4e206b1e5cf2e8e1e48fd345619c5c0484f4
2130+
React-defaultsnativemodule: f80f41ea8c1216917fd224b553291360e0e6a175
2131+
React-domnativemodule: b14aaaf4afbaa7e1dbc86ad78cbcc71eb59f1faf
2132+
React-Fabric: 409ce8a065374d737bdbc0fce506dcdda8f51e88
2133+
React-FabricComponents: bd5faafffd07e56cf217d5417e80ec29348c19d9
2134+
React-FabricImage: 04d01f3ecfed6121733613a5c794f684e81cb3fb
21352135
React-featureflags: 4503c901bf16b267b689e8a1aed24e951e0b091b
2136-
React-featureflagsnativemodule: 415168f5d23413fd0cc55ad98c41a3f3f135b2a7
2137-
React-graphics: c619a6e974baf9a7dbae8442944c7b7408391d46
2138-
React-hermes: 24bfc254f1ba83182d4936641898fe963af343fb
2139-
React-idlecallbacksnativemodule: 2c2e4c3f561a98c84a7a68c0d1f868b64ca5f839
2140-
React-ImageManager: ba9c89729be310413c610444a658fac505253d2c
2141-
React-jserrorhandler: bf16ea495377b22223bf93f3ef6d0711b9852613
2142-
React-jsi: ede7e8c96f997f8772871c82688cea53c1ffb148
2143-
React-jsiexecutor: fc9b287189ce800a92d5ab4e7291508eacaab451
2144-
React-jsinspector: fa5e8b22102b599c2bb2aeafebbf957a1ab836da
2145-
React-jsitracing: f38c15aeb910bafcf3ba2e24af8c92e6af4ce1d4
2146-
React-logger: f9d104eace4ce03d7d5ab96802069d9905082225
2147-
React-Mapbuffer: 23ffe602d0f5ca53b861ef8534cb8c63c4479671
2148-
React-microtasksnativemodule: 73fdf0c53b6d50d55de2d5bd9abfb8c006b043a4
2149-
react-native-safe-area-context: 458f6b948437afcb59198016b26bbd02ff9c3b47
2150-
react-native-webview: 40b8823be3fac70f0404016e6aed754ef4307517
2136+
React-featureflagsnativemodule: 79c980bfc96bcdcc9bd793d49fe75bbfb0e417ad
2137+
React-graphics: c2febdc940fb3ebdaef082d940b70254ef49c7a1
2138+
React-hermes: 91baa15c07e76b0768d6e10f4dac1c080a47eef4
2139+
React-idlecallbacksnativemodule: 5daef402290b91e54a884101b032186c03fa1827
2140+
React-ImageManager: b258354a48a92168edc41fdc0c14a4310cc4d576
2141+
React-jserrorhandler: 45d858315f6474dad3912aadb3f6595004dc5f4f
2142+
React-jsi: 87fa67556d7a82125bc77930bf973717fb726d14
2143+
React-jsiexecutor: 3a92052dd96cff1cd693fa3ef8d9738b1d05372a
2144+
React-jsinspector: 05aff7dd91b0685d351cdeb8c151c9f9ec97accd
2145+
React-jsitracing: 419fa21e8543f5a938b11b5a0bfc257b00dac7a5
2146+
React-logger: 5cad0c76d056809523289e589309012215a393b5
2147+
React-Mapbuffer: a381120aea722d2244d4e4b663a10d4c3b2d4e51
2148+
React-microtasksnativemodule: d9b946675010659cddd1c7611c074216579c8ad3
2149+
react-native-safe-area-context: 0f16e24dc808e9f0ced17f2bdcec692b2376fb68
2150+
react-native-webview: 2ae666ce72cfd3c38d8750c2009f5caa621d709f
21512151
React-nativeconfig: 67fa7a63ea288cb5b1d0dd2deaf240405fec164f
2152-
React-NativeModulesApple: cbf1a34443e1f67b56344547f4b0af69e1c685ba
2153-
React-perflogger: f02ee21d98773121d77993b3c1a8be445840fae3
2154-
React-performancetimeline: 7021d68884291b649b4c39ecb71e0fd3a2e53a59
2152+
React-NativeModulesApple: 34b7a4d7441a4ee78d18109ff107c1ccf7c074a9
2153+
React-perflogger: d1149037ac466ad2141d4ae541ca16cb73b2343b
2154+
React-performancetimeline: 6b46b0a17727a3ec22ec4777d156d6b6efc4f8eb
21552155
React-RCTActionSheet: ad84d5a0bd1ad1782f0b78b280c6f329ad79a53a
2156-
React-RCTAnimation: 388460f7c124c76e337c6646738a83d6ea147095
2157-
React-RCTAppDelegate: 4661e2a44f7ce1033bf6f373f7d5368b11f5a2be
2158-
React-RCTBlob: 07cccbb74e22ce66745358799f6ab02a5bed2993
2159-
React-RCTFabric: 77ebcd07a3c1f3d4c2d2f67f69033a65d16a36a8
2160-
React-RCTImage: 8fbdae841ea1217c44f4c413bba2403134b83cd1
2161-
React-RCTLinking: c59bf8286ba2cc327b01bb524fb9c16446dc18bc
2162-
React-RCTNetwork: 2c137a0aaaed2cf4bb53aff82a2bb8c34f2fbeac
2163-
React-RCTSettings: 9fcd32c5b38af6421a3dd20cdd9ebf09df0a9a6d
2164-
React-RCTText: 5308618477fec454282809065bd121c2bd3dd5e1
2165-
React-RCTVibration: 7b2a186756b5c8e586e3e7948eed4432a93299c0
2156+
React-RCTAnimation: 64ed42bb43b33b0d861126f83048429606390903
2157+
React-RCTAppDelegate: de8150cd7e748bd7a98ffc05c88f21c668407ab4
2158+
React-RCTBlob: e74dfdbbfcd46d9d1eec3b3a0f045e655e3f7861
2159+
React-RCTFabric: bc0327e719fb12f969ac0e17485ba274b9c2c335
2160+
React-RCTImage: 1b6d8ad60f74a3cec4ee52e0ca55f1773afd03f4
2161+
React-RCTLinking: 88b2384d876346fbb16839a60c1d20830b2e95fe
2162+
React-RCTNetwork: 88aa473814e796d3a7bc6a0b51e7ae5749bdc243
2163+
React-RCTSettings: 0d73a1846aef87ef07c2026c186ea0d80602a130
2164+
React-RCTText: bfdb776f849156f895909ee999b4b5f2f9cf9a0b
2165+
React-RCTVibration: 81c8bbcc841ce5a7ae6e1bd2ec949b30e58d1fcf
21662166
React-rendererconsistency: 65d4692825fda4d9516924b68c29d0f28da3158c
2167-
React-rendererdebug: 0b97f49d44c91862e1576961faf6bde836ed4eb3
2167+
React-rendererdebug: ab3696594d3506acc22ecea4dd68ac258c529c2d
21682168
React-rncore: 6aca111c05a48c58189a005cb10a7b52780738dc
2169-
React-RuntimeApple: aa20633298595444bf2dfbc5246889b4f475b871
2170-
React-RuntimeCore: 8ac56cc6d82a1090f1d15d48b487c9a5a1d7d915
2169+
React-RuntimeApple: 5245e8cf30e417fe3e798ed991b938679656ab8f
2170+
React-RuntimeCore: c79d23b31aded614f4afeaac53f4da37c792c362
21712171
React-runtimeexecutor: 732038d7c356ba74132f1d16253a410621d3c2c1
2172-
React-RuntimeHermes: a695d944686adc97f85a1b34c31840a0a39e356c
2173-
React-runtimescheduler: 00666e100e35a13f28fb2fdab22817cf62bbd6a3
2172+
React-RuntimeHermes: b3b1d7fc42d74141a71ae23fedbc4e07e5a7fbd2
2173+
React-runtimescheduler: 6e804311c6c9512ffe7f4b68d012767b225c48a1
21742174
React-timing: c2915214b94a62bdf77d2965c31f76bc25b362a5
2175-
React-utils: 9f9a6a31d703b136eb1614d914c10a3c96b1e6dd
2176-
ReactCodegen: 9a99ced51aab02909c7ab5056f33dff7054305bb
2177-
ReactCommon: 04292c6f596181ebf755e7929d96d2148542b0e8
2178-
rive-react-native: 49de99afe87a90fb49b225d1d530ec0141bd27a1
2179-
RiveRuntime: 208ef4af7502e8befee41df6ec0178d9ef6a1f9f
2180-
RNCPicker: d23ebebb0c66864ac3edf260c20f8a4470aa2769
2181-
RNGestureHandler: fc5ce5bf284640d3af6431c3a5c3bc121e98d045
2182-
RNReanimated: 9ee6347ca0aa3cf78cae715455e781728ae142e2
2183-
RNScreens: d022507f2b6d76c73335e9e35aedcf7bb2f791b0
2175+
React-utils: 0342746d2cf989cf5e0d1b84c98cfa152edbdf3f
2176+
ReactCodegen: e1c019dc68733dd2c5d3b263b4a6dc72002c0045
2177+
ReactCommon: 81e0744ee33adfd6d586141b927024f488bc49ea
2178+
rive-react-native: 7d5145e9581744c0849f3153320b8a24f96f07f3
2179+
RiveRuntime: 1748a5e12764dbb732894ac719691f6abd4cad22
2180+
RNCPicker: c657bd58a82b164a957812f82a0b4bab4245de2e
2181+
RNGestureHandler: 16ef3dc2d7ecb09f240f25df5255953c4098819b
2182+
RNReanimated: a2692304a6568bc656c04c8ffea812887d37436e
2183+
RNScreens: 351f431ef2a042a1887d4d90e1c1024b8ae9d123
21842184
SocketRocket: d4aabe649be1e368d1318fdf28a022d714d65748
21852185
Yoga: 90d80701b27946c4b23461c00a7207f300a6ff71
21862186

21872187
PODFILE CHECKSUM: 7111cb0109850378b078b31993e62f5f22d4dcde
21882188

2189-
COCOAPODS: 1.15.2
2189+
COCOAPODS: 1.16.2

0 commit comments

Comments
 (0)