Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump iOS and Android dependencies to support elastic easing and nested inputs #210

Merged
merged 3 commits into from
Nov 27, 2023
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions android/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -132,10 +132,10 @@ dependencies {
api 'com.facebook.react:react-native:+'
implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:$lifecycle_version"
implementation 'androidx.core:core-ktx:1.10.0'
implementation 'androidx.core:core-ktx:1.12.0'
implementation 'androidx.appcompat:appcompat:1.6.1'
implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.4.1'
implementation 'app.rive:rive-android:8.4.0'
implementation 'app.rive:rive-android:8.7.0'
implementation "androidx.startup:startup-runtime:1.1.1"
implementation 'com.android.volley:volley:1.2.0'
}
4 changes: 2 additions & 2 deletions android/gradle.properties
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
RiveReactNative_kotlinVersion=1.8.10
RiveReactNative_compileSdkVersion=33
RiveReactNative_compileSdkVersion=34
RiveReactNative_buildToolsVersion=30.0.3
RiveReactNative_targetSdkVersion=33
RiveReactNative_targetSdkVersion=34
14 changes: 7 additions & 7 deletions example/android/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -75,10 +75,10 @@ import com.android.build.OutputFile
* ]
*/

project.ext.react = [
enableHermes: true, // clean and rebuild if changing
entryFile: "index.tsx",
]
//project.ext.react = [
// enableHermes: true, // clean and rebuild if changing
// entryFile: "index.tsx",
//]

apply plugin: "com.facebook.react"

Expand Down Expand Up @@ -115,17 +115,17 @@ react {
// bundleAssetName = "MyApplication.android.bundle"
//
// The entry file for bundle generation. Default is 'index.android.js' or 'index.js'
// entryFile = file("../js/MyApplication.android.js")
entryFile = file("..index.tsx")
//
// A list of extra flags to pass to the 'bundle' commands.
// See https://github.com/react-native-community/cli/blob/main/docs/commands.md#bundle
// extraPackagerArgs = []
/* Hermes Commands */
// The hermes compiler command to run. By default it is 'hermesc'
// hermesCommand = "$rootDir/my-custom-hermesc/bin/hermesc"
hermesCommand = "$rootDir/my-custom-hermesc/bin/hermesc"
//
// The list of flags to pass to the Hermes compiler. By default is "-O", "-output-source-map"
// hermesFlags = ["-O", "-output-source-map"]
hermesFlags = ["-O", "-output-source-map"]
}
/**
* Run Proguard to shrink the Java bytecode in release builds.
Expand Down
Binary file not shown.
6 changes: 3 additions & 3 deletions example/android/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@

buildscript {
ext {
buildToolsVersion = "33.0.0"
buildToolsVersion = "34.0.0"
minSdkVersion = 21
compileSdkVersion = 33
targetSdkVersion = 33
compileSdkVersion = 34
targetSdkVersion = 34
kotlinVersion = "1.8.10"

// We use NDK 23 which has both M1 support and is the side-by-side NDK version from AGP.
Expand Down
4 changes: 4 additions & 0 deletions example/android/gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,10 @@ android.useAndroidX=true
android.enableJetifier=true
FLIPPER_VERSION=0.182.0
org.gradle.jvmargs=-Xmx4608m
# org.gradle.jvmargs=-Xmx4g
# org.gradle.daemon=true
# org.gradle.parallel=true
# org.gradle.configureondemand=true

# Use this property to specify which architecture you want to build.
# You can also override it from the CLI using
Expand Down
Binary file added example/ios/Assets/nested_menu.riv
Binary file not shown.
8 changes: 8 additions & 0 deletions example/ios/Podfile
Original file line number Diff line number Diff line change
Expand Up @@ -18,5 +18,13 @@ target 'RiveReactNativeExample' do
use_flipper!
post_install do |installer|
flipper_post_install(installer)
# Issue with RCT-Folly and XCode 15 with recommended path forward explained
# here: https://github.com/facebook/react-native/issues/39568#issuecomment-1762890606
react_native_post_install(
installer,
config[:reactNativePath],
:mac_catalyst_enabled => false
)
__apply_Xcode_12_5_M1_post_install_workaround(installer)
end
end
Loading
Loading