Upgrade React Native and deps (#68)

* upgrade RN to 0.67-rc.6
upgrade react-native-reanimated to 2.3.1
debug and release building/working

* update to RN stable 0.67

* yarn upgrade

also use xmldom builtin types

* ignore ndk dir for linting

* upgrade types (RN 0.67 not out yet)

* remove deprecated rule

* actually i like that one, keep for now

* update licenses

* upgrade RN types and use builtin dep

* upgrade RN 0.67.1
This commit is contained in:
austinried 2022-01-23 13:36:02 +09:00 committed by GitHub
parent 6883a556bf
commit ec390f593c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
22 changed files with 5312 additions and 1631 deletions

2
.bundle/config Normal file
View File

@ -0,0 +1,2 @@
BUNDLE_PATH: "vendor/bundle"
BUNDLE_FORCE_RUBY_PLATFORM: 1

View File

@ -1,6 +1,6 @@
module.exports = {
root: true,
ignorePatterns: ['submodules/**'],
ignorePatterns: ['submodules/**', 'ndk/**'],
extends: '@react-native-community',
rules: {
'@typescript-eslint/no-unused-vars': ['warn'],

1
.gitignore vendored
View File

@ -28,6 +28,7 @@ build/
.gradle
local.properties
*.iml
*.hprof
# node.js
#

View File

@ -1,7 +1,7 @@
module.exports = {
bracketSpacing: true,
jsxBracketSameLine: true,
singleQuote: true,
jsxBracketSameLine: true,
trailingComma: 'all',
arrowParens: 'avoid',
printWidth: 120,

1
.ruby-version Normal file
View File

@ -0,0 +1 @@
2.7.4

6
Gemfile Normal file
View File

@ -0,0 +1,6 @@
source 'https://rubygems.org'
# You may use http://rbenv.org/ or https://rvm.io/ to install and use this version
ruby '2.7.4'
gem 'cocoapods', '~> 1.11', '>= 1.11.2'

100
Gemfile.lock Normal file
View File

@ -0,0 +1,100 @@
GEM
remote: https://rubygems.org/
specs:
CFPropertyList (3.0.5)
rexml
activesupport (6.1.4.4)
concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (>= 1.6, < 2)
minitest (>= 5.1)
tzinfo (~> 2.0)
zeitwerk (~> 2.3)
addressable (2.8.0)
public_suffix (>= 2.0.2, < 5.0)
algoliasearch (1.27.5)
httpclient (~> 2.8, >= 2.8.3)
json (>= 1.5.1)
atomos (0.1.3)
claide (1.1.0)
cocoapods (1.11.2)
addressable (~> 2.8)
claide (>= 1.0.2, < 2.0)
cocoapods-core (= 1.11.2)
cocoapods-deintegrate (>= 1.0.3, < 2.0)
cocoapods-downloader (>= 1.4.0, < 2.0)
cocoapods-plugins (>= 1.0.0, < 2.0)
cocoapods-search (>= 1.0.0, < 2.0)
cocoapods-trunk (>= 1.4.0, < 2.0)
cocoapods-try (>= 1.1.0, < 2.0)
colored2 (~> 3.1)
escape (~> 0.0.4)
fourflusher (>= 2.3.0, < 3.0)
gh_inspector (~> 1.0)
molinillo (~> 0.8.0)
nap (~> 1.0)
ruby-macho (>= 1.0, < 3.0)
xcodeproj (>= 1.21.0, < 2.0)
cocoapods-core (1.11.2)
activesupport (>= 5.0, < 7)
addressable (~> 2.8)
algoliasearch (~> 1.0)
concurrent-ruby (~> 1.1)
fuzzy_match (~> 2.0.4)
nap (~> 1.0)
netrc (~> 0.11)
public_suffix (~> 4.0)
typhoeus (~> 1.0)
cocoapods-deintegrate (1.0.5)
cocoapods-downloader (1.5.1)
cocoapods-plugins (1.0.0)
nap
cocoapods-search (1.0.1)
cocoapods-trunk (1.6.0)
nap (>= 0.8, < 2.0)
netrc (~> 0.11)
cocoapods-try (1.2.0)
colored2 (3.1.2)
concurrent-ruby (1.1.9)
escape (0.0.4)
ethon (0.15.0)
ffi (>= 1.15.0)
ffi (1.15.5)
fourflusher (2.3.1)
fuzzy_match (2.0.4)
gh_inspector (1.1.3)
httpclient (2.8.3)
i18n (1.8.11)
concurrent-ruby (~> 1.0)
json (2.6.1)
minitest (5.15.0)
molinillo (0.8.0)
nanaimo (0.3.0)
nap (1.1.0)
netrc (0.11.0)
public_suffix (4.0.6)
rexml (3.2.5)
ruby-macho (2.5.1)
typhoeus (1.4.0)
ethon (>= 0.9.0)
tzinfo (2.0.4)
concurrent-ruby (~> 1.0)
xcodeproj (1.21.0)
CFPropertyList (>= 2.3.3, < 4.0)
atomos (~> 0.1.3)
claide (>= 1.0.2, < 2.0)
colored2 (~> 3.1)
nanaimo (~> 0.3.0)
rexml (~> 3.2.4)
zeitwerk (2.5.3)
PLATFORMS
ruby
DEPENDENCIES
cocoapods (~> 1.11, >= 1.11.2)
RUBY VERSION
ruby 2.7.4p191
BUNDLED WITH
2.2.27

View File

@ -10,3 +10,7 @@
# Add any project specific keep options here:
-keep class com.facebook.react.turbomodule.** { *; }
# react-native-reanimated
# https://github.com/software-mansion/react-native-reanimated/pull/2725
-keep class com.swmansion.** {*;}

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@ -0,0 +1,36 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright (C) 2014 The Android Open Source Project
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
-->
<inset xmlns:android="http://schemas.android.com/apk/res/android"
android:insetLeft="@dimen/abc_edit_text_inset_horizontal_material"
android:insetRight="@dimen/abc_edit_text_inset_horizontal_material"
android:insetTop="@dimen/abc_edit_text_inset_top_material"
android:insetBottom="@dimen/abc_edit_text_inset_bottom_material">
<selector>
<!--
This file is a copy of abc_edit_text_material (https://bit.ly/3k8fX7I).
The item below with state_pressed="false" and state_focused="false" causes a NullPointerException.
NullPointerException:tempt to invoke virtual method 'android.graphics.drawable.Drawable android.graphics.drawable.Drawable$ConstantState.newDrawable(android.content.res.Resources)'
<item android:state_pressed="false" android:state_focused="false" android:drawable="@drawable/abc_textfield_default_mtrl_alpha"/>
For more info, see https://bit.ly/3CdLStv (react-native/pull/29452) and https://bit.ly/3nxOMoR.
-->
<item android:state_enabled="false" android:drawable="@drawable/abc_textfield_default_mtrl_alpha"/>
<item android:drawable="@drawable/abc_textfield_activated_mtrl_alpha"/>
</selector>
</inset>

View File

@ -3,7 +3,7 @@
<!-- Base application theme. -->
<style name="AppTheme" parent="Theme.AppCompat.DayNight.NoActionBar">
<!-- Customize your theme here. -->
<item name="android:textColor">#000000</item>
<item name="android:editTextBackground">@drawable/rn_edit_text_material</item>
</style>
</resources>

View File

@ -2,24 +2,25 @@
buildscript {
ext {
buildToolsVersion = "30.0.3"
buildToolsVersion = "30.0.2"
minSdkVersion = 21
compileSdkVersion = 30
targetSdkVersion = 30
ndkVersion = "20.1.5948944"
ndkVersion = "21.4.7075529"
// react-native-async-storage next
kotlinVersion = '1.4.21'
}
repositories {
google()
jcenter()
mavenCentral()
// jcenter()
maven {
url 'https://plugins.gradle.org/m2/'
}
}
dependencies {
classpath("com.android.tools.build:gradle:4.1.0")
classpath("com.android.tools.build:gradle:4.2.2")
// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
@ -45,9 +46,24 @@ allprojects {
// Android JSC is installed from npm
url("$rootDir/../node_modules/jsc-android/dist")
}
mavenCentral {
// We don't want to fetch react-native from Maven Central as there are
// older versions over there.
content {
excludeGroup "com.facebook.react"
}
}
google()
jcenter()
maven { url 'https://www.jitpack.io' }
// remove jcenter once the following workarounds are no longer needed
jcenter() {
content {
// used by react-native-track-player, can remove once they use a newer exoplayer
includeGroup("com.linkedin.dexmaker")
// used by exoplayer
includeGroup("com.linkedin.dexmaker-mockito")
includeGroup("com.google.android.exoplayer")
}
}
}
}

View File

@ -9,7 +9,7 @@
# Specifies the JVM arguments used for the daemon process.
# The setting is particularly useful for tweaking memory settings.
# Default value: -Xmx10248m -XX:MaxPermSize=256m
# Default value: -Xmx1024m -XX:MaxPermSize=256m
org.gradle.jvmargs=-Xmx4g -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
# When configured, Gradle will run in incubating parallel mode.
@ -25,7 +25,7 @@ android.useAndroidX=true
android.enableJetifier=true
# Version of flipper SDK to use with React Native
FLIPPER_VERSION=0.75.1
FLIPPER_VERSION=0.99.0
# react-native-async-storage next
AsyncStorage_useNextStorage=true

View File

@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-all.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists

View File

@ -4,6 +4,12 @@
license: The Apache Software License, Version 2.0
licenseUrl: http://www.apache.org/licenses/LICENSE-2.0.txt
url: https://developer.android.com/jetpack/androidx
- artifact: androidx.annotation:annotation-experimental:+
name: annotation-experimental
copyrightHolder: Original Author
license: The Apache Software License, Version 2.0
licenseUrl: http://www.apache.org/licenses/LICENSE-2.0.txt
url: https://developer.android.com/jetpack/androidx/releases/annotation#1.1.0
- artifact: androidx.annotation:annotation:+
name: annotation
copyrightHolder: Original Author
@ -40,6 +46,12 @@
license: The Apache Software License, Version 2.0
licenseUrl: http://www.apache.org/licenses/LICENSE-2.0.txt
url: http://developer.android.com/tools/extras/support-library.html
- artifact: androidx.autofill:autofill:+
name: autofill
copyrightHolder: Original Author
license: The Apache Software License, Version 2.0
licenseUrl: http://www.apache.org/licenses/LICENSE-2.0.txt
url: https://developer.android.com/jetpack/androidx/releases/autofill#1.1.0
- artifact: androidx.cardview:cardview:+
name: cardview
copyrightHolder: Original Author
@ -189,19 +201,19 @@
copyrightHolder: Original Author
license: The Apache Software License, Version 2.0
licenseUrl: http://www.apache.org/licenses/LICENSE-2.0.txt
url: https://developer.android.com/topic/libraries/architecture/index.html
url: https://developer.android.com/jetpack/androidx/releases/room#2.3.0
- artifact: androidx.room:room-ktx:+
name: room-ktx
copyrightHolder: Original Author
license: The Apache Software License, Version 2.0
licenseUrl: http://www.apache.org/licenses/LICENSE-2.0.txt
url: https://developer.android.com/topic/libraries/architecture/index.html
url: https://developer.android.com/jetpack/androidx/releases/room#2.3.0
- artifact: androidx.room:room-runtime:+
name: room-runtime
copyrightHolder: Original Author
license: The Apache Software License, Version 2.0
licenseUrl: http://www.apache.org/licenses/LICENSE-2.0.txt
url: https://developer.android.com/topic/libraries/architecture/index.html
url: https://developer.android.com/jetpack/androidx/releases/room#2.3.0
- artifact: androidx.savedstate:savedstate:+
name: savedstate
copyrightHolder: Original Author
@ -301,62 +313,104 @@
- artifact: com.facebook.fresco:drawee:+
name: drawee
copyrightHolder: Original Author
license: MIT License
license: MIT
licenseUrl: https://github.com/facebook/fresco/blob/master/LICENSE
url: https://github.com/facebook/fresco
- artifact: com.facebook.fresco:fbcore:+
name: fbcore
copyrightHolder: Original Author
license: MIT License
license: MIT
licenseUrl: https://github.com/facebook/fresco/blob/master/LICENSE
url: https://github.com/facebook/fresco
- artifact: com.facebook.fresco:fresco:+
name: fresco
copyrightHolder: Original Author
license: MIT License
license: MIT
licenseUrl: https://github.com/facebook/fresco/blob/master/LICENSE
url: https://github.com/facebook/fresco
- artifact: com.facebook.fresco:imagepipeline-base:+
name: imagepipeline-base
copyrightHolder: Original Author
license: MIT License
license: MIT
licenseUrl: https://github.com/facebook/fresco/blob/master/LICENSE
url: https://github.com/facebook/fresco
- artifact: com.facebook.fresco:imagepipeline-native:+
name: imagepipeline-native
copyrightHolder: Original Author
license: MIT
licenseUrl: https://github.com/facebook/fresco/blob/master/LICENSE
url: https://github.com/facebook/fresco
- artifact: com.facebook.fresco:imagepipeline-okhttp3:+
name: imagepipeline-okhttp3
copyrightHolder: Original Author
license: MIT License
license: MIT
licenseUrl: https://github.com/facebook/fresco/blob/master/LICENSE
url: https://github.com/facebook/fresco
- artifact: com.facebook.fresco:imagepipeline:+
name: imagepipeline
copyrightHolder: Original Author
license: MIT License
license: MIT
licenseUrl: https://github.com/facebook/fresco/blob/master/LICENSE
url: https://github.com/facebook/fresco
- artifact: com.facebook.fresco:memory-type-ashmem:+
name: memory-type-ashmem
copyrightHolder: Original Author
license: MIT
licenseUrl: https://github.com/facebook/fresco/blob/master/LICENSE
url: https://github.com/facebook/fresco
- artifact: com.facebook.fresco:memory-type-java:+
name: memory-type-java
copyrightHolder: Original Author
license: MIT
licenseUrl: https://github.com/facebook/fresco/blob/master/LICENSE
url: https://github.com/facebook/fresco
- artifact: com.facebook.fresco:memory-type-native:+
name: memory-type-native
copyrightHolder: Original Author
license: MIT
licenseUrl: https://github.com/facebook/fresco/blob/master/LICENSE
url: https://github.com/facebook/fresco
- artifact: com.facebook.fresco:middleware:+
name: middleware
copyrightHolder: Original Author
license: MIT
licenseUrl: https://github.com/facebook/fresco/blob/master/LICENSE
url: https://github.com/facebook/fresco
- artifact: com.facebook.fresco:nativeimagefilters:+
name: nativeimagefilters
copyrightHolder: Original Author
license: MIT License
license: MIT
licenseUrl: https://github.com/facebook/fresco/blob/master/LICENSE
url: https://github.com/facebook/fresco
- artifact: com.facebook.fresco:nativeimagetranscoder:+
name: nativeimagetranscoder
copyrightHolder: Original Author
license: MIT License
license: MIT
licenseUrl: https://github.com/facebook/fresco/blob/master/LICENSE
url: https://github.com/facebook/fresco
- artifact: com.facebook.fresco:soloader:+
name: soloader
copyrightHolder: Original Author
license: MIT
licenseUrl: https://github.com/facebook/fresco/blob/master/LICENSE
url: https://github.com/facebook/fresco
- artifact: com.facebook.fresco:ui-common:+
name: ui-common
copyrightHolder: Original Author
license: MIT
licenseUrl: https://github.com/facebook/fresco/blob/master/LICENSE
url: https://github.com/facebook/fresco
- artifact: com.facebook.infer.annotation:infer-annotation:+
name: infer-annotation
copyrightHolder: Original Author
license: BSD license
license: MIT license
licenseUrl: https://github.com/facebook/infer/blob/master/LICENSE
url: http://fbinfer.com/
- artifact: com.facebook.react:react-native:+
name: react-native
copyrightHolder: Original Author
license: MIT License
licenseUrl: https://github.com/facebook/react-native/blob/master/LICENSE
licenseUrl: https://github.com/facebook/react-native/blob/HEAD/LICENSE
url: https://github.com/facebook/react-native
- artifact: com.facebook.soloader:annotation:+
name: annotation
@ -494,21 +548,21 @@
- artifact: com.squareup.okhttp3:okhttp-urlconnection:+
name: okhttp-urlconnection
copyrightHolder: Original Author
license: Apache-2.0 License
licenseUrl: https://github.com/square/okhttp/blob/master/LICENSE.txt
url: https://github.com/square/okhttp
license: The Apache Software License, Version 2.0
licenseUrl: http://www.apache.org/licenses/LICENSE-2.0.txt
url: https://square.github.io/okhttp/
- artifact: com.squareup.okhttp3:okhttp:+
name: okhttp
copyrightHolder: Original Author
license: Apache-2.0 License
licenseUrl: https://github.com/square/okhttp/blob/master/LICENSE.txt
url: https://github.com/square/okhttp
license: The Apache Software License, Version 2.0
licenseUrl: http://www.apache.org/licenses/LICENSE-2.0.txt
url: https://square.github.io/okhttp/
- artifact: com.squareup.okio:okio:+
name: okio
copyrightHolder: Original Author
license: Apache-2.0 License
licenseUrl: https://github.com/square/okio/blob/master/LICENSE.txt
url: https://github.com/square/okio
license: The Apache Software License, Version 2.0
licenseUrl: http://www.apache.org/licenses/LICENSE-2.0.txt
url: https://github.com/square/okio/
- artifact: javax.inject:javax.inject:+
name: javax.inject
copyrightHolder: Original Author
@ -563,12 +617,30 @@
license: The Apache License, Version 2.0
licenseUrl: http://www.apache.org/licenses/LICENSE-2.0.txt
url: https://kotlinlang.org/
- artifact: org.jetbrains.kotlin:kotlin-reflect:+
name: kotlin-reflect
copyrightHolder: Original Author
license: The Apache License, Version 2.0
licenseUrl: http://www.apache.org/licenses/LICENSE-2.0.txt
url: https://kotlinlang.org/
- artifact: org.jetbrains.kotlin:kotlin-stdlib-common:+
name: kotlin-stdlib-common
copyrightHolder: Original Author
license: The Apache License, Version 2.0
licenseUrl: http://www.apache.org/licenses/LICENSE-2.0.txt
url: https://kotlinlang.org/
- artifact: org.jetbrains.kotlin:kotlin-stdlib-jdk7:+
name: kotlin-stdlib-jdk7
copyrightHolder: Original Author
license: The Apache License, Version 2.0
licenseUrl: http://www.apache.org/licenses/LICENSE-2.0.txt
url: https://kotlinlang.org/
- artifact: org.jetbrains.kotlin:kotlin-stdlib-jdk8:+
name: kotlin-stdlib-jdk8
copyrightHolder: Original Author
license: The Apache License, Version 2.0
licenseUrl: http://www.apache.org/licenses/LICENSE-2.0.txt
url: https://kotlinlang.org/
- artifact: org.jetbrains.kotlin:kotlin-stdlib:+
name: kotlin-stdlib
copyrightHolder: Original Author

View File

@ -48,7 +48,7 @@ const More = React.memo<{ contextItem?: HeaderContextItem }>(({ contextItem }) =
const HeaderBar = React.memo<{
title?: string
headerStyle?: Animated.AnimatedStyleProp<ViewStyle> | Animated.AnimatedStyleProp<ViewStyle>[]
headerStyle?: Animated.AnimateStyle<ViewStyle> | Animated.AnimateStyle<ViewStyle>[]
HeaderCenter?: ReactComponentLike
contextItem?: HeaderContextItem
}>(({ title, headerStyle, HeaderCenter, contextItem }) => {

View File

@ -206,7 +206,7 @@ const ServerView: React.FC<{
placeholderTextColor="grey"
selectionColor={colors.text.secondary}
textContentType="username"
autoCompleteType="username"
autoComplete="username"
importantForAutofill="yes"
autoCapitalize="none"
placeholder="demo"
@ -219,7 +219,7 @@ const ServerView: React.FC<{
placeholderTextColor="grey"
selectionColor={colors.text.secondary}
textContentType="password"
autoCompleteType="password"
autoComplete="password"
autoCapitalize="none"
importantForAutofill="yes"
secureTextEntry={true}

View File

@ -35,7 +35,7 @@ import {
} from '@app/subsonic/responses'
import toast from '@app/util/toast'
import userAgent from '@app/util/userAgent'
import { DOMParser } from 'xmldom'
import { DOMParser } from '@xmldom/xmldom'
export class SubsonicApiError extends Error {
method: string

View File

@ -26,19 +26,20 @@
"@react-navigation/bottom-tabs": "^5.11.11",
"@react-navigation/material-top-tabs": "^5.3.15",
"@react-navigation/native": "^5.9.4",
"@xmldom/xmldom": "^0.7.2",
"@types/react": "^17",
"@xmldom/xmldom": "^0.7.0",
"immer": "^9.0.6",
"lodash.debounce": "^4.0.8",
"md5": "^2.3.0",
"react": "17.0.1",
"react-native": "0.64.1",
"react": "17.0.2",
"react-native": "0.67.1",
"react-native-fs": "^2.18.0",
"react-native-gesture-handler": "^1.10.3",
"react-native-get-random-values": "^1.7.0",
"react-native-image-colors": "^1.3.0",
"react-native-linear-gradient": "^2.5.6",
"react-native-popup-menu": "^0.15.11",
"react-native-reanimated": "^2.2.0",
"react-native-reanimated": "^2.3.1",
"react-native-safe-area-context": "^3.2.0",
"react-native-screens": "^3.4.0",
"react-native-tab-view": "^2.16.0",
@ -55,11 +56,9 @@
"@types/jest": "^26.0.23",
"@types/lodash.debounce": "^4.0.6",
"@types/md5": "^2.3.0",
"@types/react-native": "^0.64.5",
"@types/react-native-vector-icons": "^6.4.7",
"@types/react-test-renderer": "^16.9.2",
"@types/uuid": "^8.3.0",
"@types/xmldom": "^0.1.31",
"babel-jest": "^26.6.3",
"babel-plugin-module-resolver": "^4.1.0",
"eslint": "^7.14.0",

View File

@ -46,7 +46,7 @@
"allowSyntheticDefaultImports": true /* Allow default imports from modules with no default export. This does not affect code emit, just typechecking. */,
"esModuleInterop": true /* Enables emit interoperability between CommonJS and ES Modules via creation of namespace objects for all imports. Implies 'allowSyntheticDefaultImports'. */,
// "preserveSymlinks": true, /* Do not resolve the real path of symlinks. */
"skipLibCheck": false /* Skip type checking of declaration files. */,
"skipLibCheck": true /* Skip type checking of declaration files. */,
/* Source Map Options */
// "sourceRoot": "./", /* Specify the location where debugger should locate TypeScript files instead of source locations. */
@ -59,5 +59,5 @@
// "emitDecoratorMetadata": true, /* Enables experimental support for emitting type metadata for decorators. */
"resolveJsonModule": true
},
"exclude": ["node_modules", "babel.config.js", "metro.config.js", "jest.config.js"]
"exclude": ["node_modules", "babel.config.js", "metro.config.js", "jest.config.js", "submodules"]
}

3147
yarn.lock

File diff suppressed because it is too large Load Diff