From d17d366d5899ac6cf1f9194d4c03c45dde40d33d Mon Sep 17 00:00:00 2001 From: sethkfman <10342624+sethkfman@users.noreply.github.com> Date: Fri, 12 Nov 2021 09:39:56 -0700 Subject: [PATCH 1/6] updated android SDK and dependencies to support SDK 30 --- android/app/build.gradle | 2 ++ android/build.gradle | 6 +++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/android/app/build.gradle b/android/app/build.gradle index e753c45c467..0c0f08636cf 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -264,6 +264,8 @@ dependencies { androidTestImplementation('com.wix:detox:+') { transitive = true } androidTestImplementation 'junit:junit:4.12' implementation "androidx.swiperefreshlayout:swiperefreshlayout:1.0.0" + implementation 'com.squareup.okhttp3:okhttp:4.9.0' + debugImplementation("com.facebook.flipper:flipper:${FLIPPER_VERSION}") { exclude group:'com.facebook.fbjni' } diff --git a/android/build.gradle b/android/build.gradle index 8fc4b6bd42f..ee7644176dd 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -3,10 +3,10 @@ buildscript { ext { - buildToolsVersion = "29.0.2" + buildToolsVersion = "30.0.3" minSdkVersion = project.hasProperty('minSdkVersion') ? project.getProperty('minSdkVersion') : 19 - compileSdkVersion = 29 - targetSdkVersion = 29 + compileSdkVersion = 30 + targetSdkVersion = 30 kotlin_version = "1.3.50" kotlinVersion = "$kotlin_version" } From 76d5e7d882e41092c78541ea8ae2f0af15409309 Mon Sep 17 00:00:00 2001 From: sethkfman <10342624+sethkfman@users.noreply.github.com> Date: Fri, 12 Nov 2021 11:21:01 -0700 Subject: [PATCH 2/6] added okhttp3 dependencies --- android/app/build.gradle | 8 +++++--- app/components/Views/Entry/index.js | 2 +- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/android/app/build.gradle b/android/app/build.gradle index 0c0f08636cf..e644a533dfd 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -105,7 +105,8 @@ import com.android.build.OutputFile project.ext.react = [ entryFile: "index.js", - enableHermes: false, // clean and rebuild if changing + // enableHermes: false, // clean and rebuild if changing + enableHermes: true, // clean and rebuild if changing ] apply from: "../../node_modules/react-native/react.gradle" @@ -189,7 +190,6 @@ android { } signingConfigs { - def pass = "" release { storeFile file('../keystores/release.keystore') storePassword System.getenv("BITRISEIO_ANDROID_KEYSTORE_PASSWORD") @@ -264,7 +264,9 @@ dependencies { androidTestImplementation('com.wix:detox:+') { transitive = true } androidTestImplementation 'junit:junit:4.12' implementation "androidx.swiperefreshlayout:swiperefreshlayout:1.0.0" - implementation 'com.squareup.okhttp3:okhttp:4.9.0' + implementation "com.squareup.okhttp3:okhttp:4.9.1" + implementation "com.squareup.okhttp3:logging-interceptor:4.9.1" + implementation "com.squareup.okhttp3:okhttp-urlconnection:4.9.1" debugImplementation("com.facebook.flipper:flipper:${FLIPPER_VERSION}") { exclude group:'com.facebook.fbjni' diff --git a/app/components/Views/Entry/index.js b/app/components/Views/Entry/index.js index 1f3117ff6c2..f40defd774b 100644 --- a/app/components/Views/Entry/index.js +++ b/app/components/Views/Entry/index.js @@ -77,7 +77,7 @@ const Entry = (props) => { const animation = useRef(null); const animationName = useRef(null); const opacity = useRef(new Animated.Value(1)).current; - + console.log('Hermes Enabled', !!global.HermesInternal); const onAnimationFinished = useCallback(() => { Animated.timing(opacity, { toValue: 0, From 1af28bff0bc57c7870dfbc4351df6f840c9f4384 Mon Sep 17 00:00:00 2001 From: sethkfman <10342624+sethkfman@users.noreply.github.com> Date: Fri, 12 Nov 2021 11:45:37 -0700 Subject: [PATCH 3/6] added hermes flag --- android/app/build.gradle | 2 +- app/components/Views/Entry/index.js | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/android/app/build.gradle b/android/app/build.gradle index e644a533dfd..bf0b0615f41 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -269,7 +269,7 @@ dependencies { implementation "com.squareup.okhttp3:okhttp-urlconnection:4.9.1" debugImplementation("com.facebook.flipper:flipper:${FLIPPER_VERSION}") { - exclude group:'com.facebook.fbjni' + exclude group:'com.facebook.fbjni' } debugImplementation("com.facebook.flipper:flipper-network-plugin:${FLIPPER_VERSION}") { exclude group:'com.facebook.flipper' diff --git a/app/components/Views/Entry/index.js b/app/components/Views/Entry/index.js index f40defd774b..17ae99002ff 100644 --- a/app/components/Views/Entry/index.js +++ b/app/components/Views/Entry/index.js @@ -1,7 +1,7 @@ import React, { useState, useRef, useEffect, useCallback } from 'react'; import { withNavigation } from '@react-navigation/compat'; import PropTypes from 'prop-types'; -import { Animated, Dimensions, StyleSheet, View } from 'react-native'; +import { Animated, Dimensions, StyleSheet, View, Text } from 'react-native'; import AsyncStorage from '@react-native-community/async-storage'; import Engine from '../../../core/Engine'; import LottieView from 'lottie-react-native'; @@ -77,7 +77,6 @@ const Entry = (props) => { const animation = useRef(null); const animationName = useRef(null); const opacity = useRef(new Animated.Value(1)).current; - console.log('Hermes Enabled', !!global.HermesInternal); const onAnimationFinished = useCallback(() => { Animated.timing(opacity, { toValue: 0, @@ -200,6 +199,7 @@ const Entry = (props) => { return ( + {`Hermes Enabled: ${!!global.HermesInternal}`} {renderAnimations()} From 027c1f26ab0ccf920529b78bb180dc807c4b2221 Mon Sep 17 00:00:00 2001 From: sethkfman <10342624+sethkfman@users.noreply.github.com> Date: Fri, 12 Nov 2021 13:44:19 -0700 Subject: [PATCH 4/6] removed heremes testing --- android/app/build.gradle | 3 +-- app/components/Views/Entry/index.js | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/android/app/build.gradle b/android/app/build.gradle index bf0b0615f41..ce6622329a4 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -105,8 +105,7 @@ import com.android.build.OutputFile project.ext.react = [ entryFile: "index.js", - // enableHermes: false, // clean and rebuild if changing - enableHermes: true, // clean and rebuild if changing + enableHermes: false, // clean and rebuild if changing ] apply from: "../../node_modules/react-native/react.gradle" diff --git a/app/components/Views/Entry/index.js b/app/components/Views/Entry/index.js index 17ae99002ff..97842d55222 100644 --- a/app/components/Views/Entry/index.js +++ b/app/components/Views/Entry/index.js @@ -1,7 +1,7 @@ import React, { useState, useRef, useEffect, useCallback } from 'react'; import { withNavigation } from '@react-navigation/compat'; import PropTypes from 'prop-types'; -import { Animated, Dimensions, StyleSheet, View, Text } from 'react-native'; +import { Animated, Dimensions, StyleSheet, View } from 'react-native'; import AsyncStorage from '@react-native-community/async-storage'; import Engine from '../../../core/Engine'; import LottieView from 'lottie-react-native'; @@ -199,7 +199,6 @@ const Entry = (props) => { return ( - {`Hermes Enabled: ${!!global.HermesInternal}`} {renderAnimations()} From bc854fe5ed9e4590596ced7edc8f0ee355568bec Mon Sep 17 00:00:00 2001 From: sethkfman <10342624+sethkfman@users.noreply.github.com> Date: Fri, 12 Nov 2021 14:34:35 -0700 Subject: [PATCH 5/6] undo edits in entry --- app/components/Views/Entry/index.js | 1 + 1 file changed, 1 insertion(+) diff --git a/app/components/Views/Entry/index.js b/app/components/Views/Entry/index.js index 97842d55222..1f3117ff6c2 100644 --- a/app/components/Views/Entry/index.js +++ b/app/components/Views/Entry/index.js @@ -77,6 +77,7 @@ const Entry = (props) => { const animation = useRef(null); const animationName = useRef(null); const opacity = useRef(new Animated.Value(1)).current; + const onAnimationFinished = useCallback(() => { Animated.timing(opacity, { toValue: 0, From 8ae6cf8b4453b87d762c45d00c7339825dcd0892 Mon Sep 17 00:00:00 2001 From: Ricky Miller Date: Tue, 16 Nov 2021 12:50:51 -0500 Subject: [PATCH 6/6] adjust tabbing --- android/app/build.gradle | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/android/app/build.gradle b/android/app/build.gradle index ce6622329a4..db7843d72df 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -264,11 +264,11 @@ dependencies { androidTestImplementation 'junit:junit:4.12' implementation "androidx.swiperefreshlayout:swiperefreshlayout:1.0.0" implementation "com.squareup.okhttp3:okhttp:4.9.1" - implementation "com.squareup.okhttp3:logging-interceptor:4.9.1" - implementation "com.squareup.okhttp3:okhttp-urlconnection:4.9.1" + implementation "com.squareup.okhttp3:logging-interceptor:4.9.1" + implementation "com.squareup.okhttp3:okhttp-urlconnection:4.9.1" debugImplementation("com.facebook.flipper:flipper:${FLIPPER_VERSION}") { - exclude group:'com.facebook.fbjni' + exclude group:'com.facebook.fbjni' } debugImplementation("com.facebook.flipper:flipper-network-plugin:${FLIPPER_VERSION}") { exclude group:'com.facebook.flipper'