Skip to content

Commit c2a5b54

Browse files
committed
Updates inapp module dependency to 0.9.0
1 parent f16d642 commit c2a5b54

File tree

17 files changed

+403
-21
lines changed

17 files changed

+403
-21
lines changed

CHANGELOG.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
## 0.9.0
2+
3+
* Add resolvedVersion to fetch providers override
4+
* Updates inapp module dependency to 0.9.0
5+
16
## 0.8.3
27

38
* Updates inapp module dependency to 0.8.3

InappRnSdk.podspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ Pod::Spec.new do |s|
1717

1818
s.source_files = "ios/**/*.{h,m,mm,cpp,swift}"
1919
s.private_header_files = "ios/generated/**/*.h"
20-
s.dependency "ReclaimInAppSdk", "~> 0.8.3"
20+
s.dependency "ReclaimInAppSdk", "~> 0.9.0"
2121

2222
# Use install_modules_dependencies helper to install the dependencies if React Native version >=0.71.0.
2323
# See https://github.com/facebook/react-native/blob/febf6b7f33fdb4904669f99d795eba4c0f95d7bf/scripts/cocoapods/new_architecture.rb#L79.

README.md

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -110,13 +110,13 @@ Ignore if you already have this declaration in your `Podfile`.
110110

111111
```ruby
112112
# Cocoapods is the recommended way to install the SDK.
113-
pod 'ReclaimInAppSdk', '~> 0.8.3'
113+
pod 'ReclaimInAppSdk', '~> 0.9.0'
114114
```
115115

116116
##### From a specific tag
117117

118118
```ruby
119-
pod 'ReclaimInAppSdk', :git => 'https://github.com/reclaimprotocol/reclaim-inapp-ios-sdk.git', :tag => '0.8.3'
119+
pod 'ReclaimInAppSdk', :git => 'https://github.com/reclaimprotocol/reclaim-inapp-ios-sdk.git', :tag => '0.9.0'
120120
```
121121

122122
##### From git HEAD
@@ -153,7 +153,7 @@ target 'InappRnSdkExample' do
153153
)
154154

155155
# This is the line that you may need to add in your podfile.
156-
pod 'ReclaimInAppSdk', '~> 0.8.3'
156+
pod 'ReclaimInAppSdk', '~> 0.9.0'
157157

158158
pre_install do |installer|
159159
system("cd ../../ && npx bob build --target codegen")
@@ -298,6 +298,7 @@ error.innerError
298298
299299
## Migration
300300
301+
- Migration steps for [0.9.0](https://github.com/reclaimprotocol/reclaim-inapp-reactnative-sdk/blob/main/documentation/migration.md#090)
301302
- Migration steps for [0.8.3](https://github.com/reclaimprotocol/reclaim-inapp-reactnative-sdk/blob/main/documentation/migration.md#083)
302303
- Migration steps for [0.7.3](https://github.com/reclaimprotocol/reclaim-inapp-reactnative-sdk/blob/main/documentation/migration.md#073)
303304
- Migration steps for [0.6.0](https://github.com/reclaimprotocol/reclaim-inapp-reactnative-sdk/blob/main/documentation/migration.md#060)

android/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ dependencies {
118118
implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
119119

120120
//noinspection UseTomlInstead
121-
implementation "org.reclaimprotocol:inapp_sdk:0.8.3"
121+
implementation "org.reclaimprotocol:inapp_sdk:0.9.0"
122122
}
123123

124124
if (isNewArchitectureEnabled()) {

android/generated/jni/react/renderer/components/RNInappRnSdkSpec/RNInappRnSdkSpecJSI.h

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -330,16 +330,17 @@ struct NativeInappRnSdkProviderInformationBridging {
330330

331331
#pragma mark - NativeInappRnSdkProviderInformationRequest
332332

333-
template <typename P0, typename P1, typename P2, typename P3, typename P4, typename P5>
333+
template <typename P0, typename P1, typename P2, typename P3, typename P4, typename P5, typename P6>
334334
struct NativeInappRnSdkProviderInformationRequest {
335335
P0 appId;
336336
P1 providerId;
337337
P2 sessionId;
338338
P3 signature;
339339
P4 timestamp;
340-
P5 replyId;
340+
P5 resolvedVersion;
341+
P6 replyId;
341342
bool operator==(const NativeInappRnSdkProviderInformationRequest &other) const {
342-
return appId == other.appId && providerId == other.providerId && sessionId == other.sessionId && signature == other.signature && timestamp == other.timestamp && replyId == other.replyId;
343+
return appId == other.appId && providerId == other.providerId && sessionId == other.sessionId && signature == other.signature && timestamp == other.timestamp && resolvedVersion == other.resolvedVersion && replyId == other.replyId;
343344
}
344345
};
345346

@@ -357,6 +358,7 @@ struct NativeInappRnSdkProviderInformationRequestBridging {
357358
bridging::fromJs<decltype(types.sessionId)>(rt, value.getProperty(rt, "sessionId"), jsInvoker),
358359
bridging::fromJs<decltype(types.signature)>(rt, value.getProperty(rt, "signature"), jsInvoker),
359360
bridging::fromJs<decltype(types.timestamp)>(rt, value.getProperty(rt, "timestamp"), jsInvoker),
361+
bridging::fromJs<decltype(types.resolvedVersion)>(rt, value.getProperty(rt, "resolvedVersion"), jsInvoker),
360362
bridging::fromJs<decltype(types.replyId)>(rt, value.getProperty(rt, "replyId"), jsInvoker)};
361363
return result;
362364
}
@@ -382,6 +384,10 @@ struct NativeInappRnSdkProviderInformationRequestBridging {
382384
return bridging::toJs(rt, value);
383385
}
384386

387+
static jsi::String resolvedVersionToJs(jsi::Runtime &rt, decltype(types.resolvedVersion) value) {
388+
return bridging::toJs(rt, value);
389+
}
390+
385391
static jsi::String replyIdToJs(jsi::Runtime &rt, decltype(types.replyId) value) {
386392
return bridging::toJs(rt, value);
387393
}
@@ -397,6 +403,7 @@ struct NativeInappRnSdkProviderInformationRequestBridging {
397403
result.setProperty(rt, "sessionId", bridging::toJs(rt, value.sessionId, jsInvoker));
398404
result.setProperty(rt, "signature", bridging::toJs(rt, value.signature, jsInvoker));
399405
result.setProperty(rt, "timestamp", bridging::toJs(rt, value.timestamp, jsInvoker));
406+
result.setProperty(rt, "resolvedVersion", bridging::toJs(rt, value.resolvedVersion, jsInvoker));
400407
result.setProperty(rt, "replyId", bridging::toJs(rt, value.replyId, jsInvoker));
401408
return result;
402409
}
42.6 KB
Binary file not shown.
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
distributionBase=GRADLE_USER_HOME
2+
distributionPath=wrapper/dists
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-bin.zip
4+
networkTimeout=10000
5+
validateDistributionUrl=true
6+
zipStoreBase=GRADLE_USER_HOME
7+
zipStorePath=wrapper/dists

android/gradlew

Lines changed: 251 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,251 @@
1+
#!/bin/sh
2+
3+
#
4+
# Copyright © 2015-2021 the original authors.
5+
#
6+
# Licensed under the Apache License, Version 2.0 (the "License");
7+
# you may not use this file except in compliance with the License.
8+
# You may obtain a copy of the License at
9+
#
10+
# https://www.apache.org/licenses/LICENSE-2.0
11+
#
12+
# Unless required by applicable law or agreed to in writing, software
13+
# distributed under the License is distributed on an "AS IS" BASIS,
14+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
15+
# See the License for the specific language governing permissions and
16+
# limitations under the License.
17+
#
18+
# SPDX-License-Identifier: Apache-2.0
19+
#
20+
21+
##############################################################################
22+
#
23+
# Gradle start up script for POSIX generated by Gradle.
24+
#
25+
# Important for running:
26+
#
27+
# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is
28+
# noncompliant, but you have some other compliant shell such as ksh or
29+
# bash, then to run this script, type that shell name before the whole
30+
# command line, like:
31+
#
32+
# ksh Gradle
33+
#
34+
# Busybox and similar reduced shells will NOT work, because this script
35+
# requires all of these POSIX shell features:
36+
# * functions;
37+
# * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
38+
# «${var#prefix}», «${var%suffix}», and «$( cmd )»;
39+
# * compound commands having a testable exit status, especially «case»;
40+
# * various built-in commands including «command», «set», and «ulimit».
41+
#
42+
# Important for patching:
43+
#
44+
# (2) This script targets any POSIX shell, so it avoids extensions provided
45+
# by Bash, Ksh, etc; in particular arrays are avoided.
46+
#
47+
# The "traditional" practice of packing multiple parameters into a
48+
# space-separated string is a well documented source of bugs and security
49+
# problems, so this is (mostly) avoided, by progressively accumulating
50+
# options in "$@", and eventually passing that to Java.
51+
#
52+
# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS,
53+
# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly;
54+
# see the in-line comments for details.
55+
#
56+
# There are tweaks for specific operating systems such as AIX, CygWin,
57+
# Darwin, MinGW, and NonStop.
58+
#
59+
# (3) This script is generated from the Groovy template
60+
# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
61+
# within the Gradle project.
62+
#
63+
# You can find Gradle at https://github.com/gradle/gradle/.
64+
#
65+
##############################################################################
66+
67+
# Attempt to set APP_HOME
68+
69+
# Resolve links: $0 may be a link
70+
app_path=$0
71+
72+
# Need this for daisy-chained symlinks.
73+
while
74+
APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path
75+
[ -h "$app_path" ]
76+
do
77+
ls=$( ls -ld "$app_path" )
78+
link=${ls#*' -> '}
79+
case $link in #(
80+
/*) app_path=$link ;; #(
81+
*) app_path=$APP_HOME$link ;;
82+
esac
83+
done
84+
85+
# This is normally unused
86+
# shellcheck disable=SC2034
87+
APP_BASE_NAME=${0##*/}
88+
# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
89+
APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit
90+
91+
# Use the maximum available, or set MAX_FD != -1 to use that value.
92+
MAX_FD=maximum
93+
94+
warn () {
95+
echo "$*"
96+
} >&2
97+
98+
die () {
99+
echo
100+
echo "$*"
101+
echo
102+
exit 1
103+
} >&2
104+
105+
# OS specific support (must be 'true' or 'false').
106+
cygwin=false
107+
msys=false
108+
darwin=false
109+
nonstop=false
110+
case "$( uname )" in #(
111+
CYGWIN* ) cygwin=true ;; #(
112+
Darwin* ) darwin=true ;; #(
113+
MSYS* | MINGW* ) msys=true ;; #(
114+
NONSTOP* ) nonstop=true ;;
115+
esac
116+
117+
CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
118+
119+
120+
# Determine the Java command to use to start the JVM.
121+
if [ -n "$JAVA_HOME" ] ; then
122+
if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
123+
# IBM's JDK on AIX uses strange locations for the executables
124+
JAVACMD=$JAVA_HOME/jre/sh/java
125+
else
126+
JAVACMD=$JAVA_HOME/bin/java
127+
fi
128+
if [ ! -x "$JAVACMD" ] ; then
129+
die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
130+
131+
Please set the JAVA_HOME variable in your environment to match the
132+
location of your Java installation."
133+
fi
134+
else
135+
JAVACMD=java
136+
if ! command -v java >/dev/null 2>&1
137+
then
138+
die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
139+
140+
Please set the JAVA_HOME variable in your environment to match the
141+
location of your Java installation."
142+
fi
143+
fi
144+
145+
# Increase the maximum file descriptors if we can.
146+
if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
147+
case $MAX_FD in #(
148+
max*)
149+
# In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
150+
# shellcheck disable=SC2039,SC3045
151+
MAX_FD=$( ulimit -H -n ) ||
152+
warn "Could not query maximum file descriptor limit"
153+
esac
154+
case $MAX_FD in #(
155+
'' | soft) :;; #(
156+
*)
157+
# In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
158+
# shellcheck disable=SC2039,SC3045
159+
ulimit -n "$MAX_FD" ||
160+
warn "Could not set maximum file descriptor limit to $MAX_FD"
161+
esac
162+
fi
163+
164+
# Collect all arguments for the java command, stacking in reverse order:
165+
# * args from the command line
166+
# * the main class name
167+
# * -classpath
168+
# * -D...appname settings
169+
# * --module-path (only if needed)
170+
# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables.
171+
172+
# For Cygwin or MSYS, switch paths to Windows format before running java
173+
if "$cygwin" || "$msys" ; then
174+
APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
175+
CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
176+
177+
JAVACMD=$( cygpath --unix "$JAVACMD" )
178+
179+
# Now convert the arguments - kludge to limit ourselves to /bin/sh
180+
for arg do
181+
if
182+
case $arg in #(
183+
-*) false ;; # don't mess with options #(
184+
/?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath
185+
[ -e "$t" ] ;; #(
186+
*) false ;;
187+
esac
188+
then
189+
arg=$( cygpath --path --ignore --mixed "$arg" )
190+
fi
191+
# Roll the args list around exactly as many times as the number of
192+
# args, so each arg winds up back in the position where it started, but
193+
# possibly modified.
194+
#
195+
# NB: a `for` loop captures its iteration list before it begins, so
196+
# changing the positional parameters here affects neither the number of
197+
# iterations, nor the values presented in `arg`.
198+
shift # remove old arg
199+
set -- "$@" "$arg" # push replacement arg
200+
done
201+
fi
202+
203+
204+
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
205+
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
206+
207+
# Collect all arguments for the java command:
208+
# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
209+
# and any embedded shellness will be escaped.
210+
# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
211+
# treated as '${Hostname}' itself on the command line.
212+
213+
set -- \
214+
"-Dorg.gradle.appname=$APP_BASE_NAME" \
215+
-classpath "$CLASSPATH" \
216+
org.gradle.wrapper.GradleWrapperMain \
217+
"$@"
218+
219+
# Stop when "xargs" is not available.
220+
if ! command -v xargs >/dev/null 2>&1
221+
then
222+
die "xargs is not available"
223+
fi
224+
225+
# Use "xargs" to parse quoted args.
226+
#
227+
# With -n1 it outputs one arg per line, with the quotes and backslashes removed.
228+
#
229+
# In Bash we could simply go:
230+
#
231+
# readarray ARGS < <( xargs -n1 <<<"$var" ) &&
232+
# set -- "${ARGS[@]}" "$@"
233+
#
234+
# but POSIX shell has neither arrays nor command substitution, so instead we
235+
# post-process each arg (as a line of input to sed) to backslash-escape any
236+
# character that might be a shell metacharacter, then use eval to reverse
237+
# that process (while maintaining the separation between arguments), and wrap
238+
# the whole thing up as a single "set" statement.
239+
#
240+
# This will of course break if any of these variables contains a newline or
241+
# an unmatched quote.
242+
#
243+
244+
eval "set -- $(
245+
printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" |
246+
xargs -n1 |
247+
sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' |
248+
tr '\n' ' '
249+
)" '"$@"'
250+
251+
exec "$JAVACMD" "$@"

0 commit comments

Comments
 (0)