Skip to content

Commit

Permalink
Merge branch 'dev-2.24'
Browse files Browse the repository at this point in the history
  • Loading branch information
birdofpreyru committed Mar 27, 2024
2 parents 499f851 + 7409907 commit 2c90ad1
Show file tree
Hide file tree
Showing 12 changed files with 1,136 additions and 1,306 deletions.
2 changes: 1 addition & 1 deletion .nvmrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
v18
v20.11.1
Original file line number Diff line number Diff line change
Expand Up @@ -123,9 +123,12 @@ class Downloader : AsyncTask<DownloadParams?, LongArray?, DownloadResult>() {
mAbort.set(true)
}

protected fun onProgressUpdate(vararg values: LongArray) {
super.onProgressUpdate(*values)
mParam!!.onDownloadProgress?.onDownloadProgress(values[0][0], values[0][1])
protected override fun onProgressUpdate(vararg args: LongArray?) {
val values = args[0]
super.onProgressUpdate(values)
if (values != null) {
mParam!!.onDownloadProgress?.onDownloadProgress(values[0], values[1])
}
}

protected fun onPostExecute(ex: Exception?) {}
Expand Down
6 changes: 4 additions & 2 deletions example/Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,7 @@ source 'https://rubygems.org'
# You may use http://rbenv.org/ or https://rvm.io/ to install and use this version
ruby ">= 2.6.10"

gem 'cocoapods', '~> 1.13'
gem 'activesupport', '>= 6.1.7.3', '< 7.1.0'
# Cocoapods 1.15 introduced a bug which break the build. We will remove the upper
# bound in the template on Cocoapods with next React Native release.
gem 'cocoapods', '>= 1.13', '< 1.15'
gem 'activesupport', '>= 6.1.7.5', '< 7.1.0'
5 changes: 5 additions & 0 deletions example/ios/.xcode.env
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,9 @@
# Customize the NODE_BINARY variable here.
# For example, to use nvm with brew, add the following line
# . "$(brew --prefix nvm)/nvm.sh" --no-use

# To allow finding Node installed via NVM.
export NVM_DIR="$HOME/.nvm"
[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh"

export NODE_BINARY=$(command -v node)
Loading

0 comments on commit 2c90ad1

Please sign in to comment.