Skip to content

Commit

Permalink
Merge branch 'master' into feature/add-experimental-bridgeless
Browse files Browse the repository at this point in the history
  • Loading branch information
TheRogue76 committed Feb 4, 2024
2 parents 3b9bd19 + 3876328 commit 974be5d
Show file tree
Hide file tree
Showing 17 changed files with 1,187 additions and 923 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/ios-paper-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,11 @@ concurrency:

jobs:
build-example:
runs-on: macos-12
runs-on: macos-13

strategy:
matrix:
xcode-version: [13.3.1, 14.2]
xcode-version: [14.2, 14.3.1]

steps:
- name: List all available XCode versions
Expand Down Expand Up @@ -45,7 +45,7 @@ jobs:
run: corepack enable

- name: Install CocoaPods
run: sudo gem install cocoapods
run: sudo gem install cocoapods -v 1.14.3

- name: Install Dependencies
run: yarn install --immutable
Expand Down
4 changes: 4 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,10 @@ Codegen is available to both C# and C++ applications. Dynamic loading of JSON st

</details>

## Privacy (iOS)

Lottie iOS and Lottie React Native do not collect any data. We provide this notice to help you fill out [App Privacy Details](https://developer.apple.com/app-store/app-privacy-details/). Both libraries provide privacy manifests ([Lottie iOS's privact manifest](https://github.com/airbnb/lottie-ios/blob/master/Sources/PrivacyInfo.xcprivacy), [Lottie React Native's privacy manifest](https://github.com/lottie-react-native/lottie-react-native/blob/master/packages/core/ios/PrivacyInfo.xcprivacy)) which can be included in your app and are available as bundle resources within the libraries by default.

## Usage

Lottie can be used in a declarative way:
Expand Down
6 changes: 4 additions & 2 deletions apps/fabric/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'
4 changes: 2 additions & 2 deletions apps/fabric/Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -89,8 +89,8 @@ PLATFORMS
ruby

DEPENDENCIES
activesupport (>= 6.1.7.3, < 7.1.0)
cocoapods (~> 1.13)
activesupport (>= 6.1.7.5, < 7.1.0)
cocoapods (>= 1.13, < 1.15)

RUBY VERSION
ruby 2.7.6p219
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,11 @@ class MainApplication : Application(), ReactApplication {

override val reactNativeHost: ReactNativeHost =
object : DefaultReactNativeHost(this) {
override fun getPackages(): List<ReactPackage> {
override fun getPackages(): List<ReactPackage> =
PackageList(this).packages.apply {
// Packages that cannot be autolinked yet can be added manually here, for example:
// packages.add(new MyReactNativePackage());
return PackageList(this).packages
}
// add(MyReactNativePackage())
}

override fun getJSMainModuleName(): String = "index"

Expand Down
Loading

0 comments on commit 974be5d

Please sign in to comment.