Skip to content

Commit 184136b

Browse files
authored
feat: Upgrade react-native to v0.65.1 (#247)
* 编写选项卡组件 * 类型名称请调整,添加组件文档在网站上展示 * #162修复报错 * fix:#162修复报错 * SpeedDial 悬浮标记 * 优化类型 * feat(ActionSheet): Add new component. * fix: ActionSheet 实例优化,组件优化 * feat(SearchInputBar): Add new component. * feat(Pagination): Add new component. * fix(Tooltip): 修复cloud弹出元素位置问题 * doc(Drawer): Update README.md * doc: Update README.md * fix(Rating): Rating 评分组件 使用繁琐(#244) * fix(Rating): Rating 评分组件 使用繁琐(#244) * fix(Slider): 滑块输入条 thumbSize属性没有效果, 滑块输入条 thumbSize 设置很大时然后使用 shownThumb=false 效果如下 (#234 # 233) * fix(Slider): 滑块输入条 thumbSize属性没有效果, 滑块输入条 thumbSize 设置很大时然后使用 shownThumb=false 输入条拉不满 (#234 # 233) * fix(Slider): Slider 滑块 输入条 vertical={true} 会出现一直 render (#237) * feat: Upgrade react-native to v0.65.1
1 parent 1eecbb5 commit 184136b

File tree

24 files changed

+549
-547
lines changed

24 files changed

+549
-547
lines changed

example/base/android/app/build.gradle

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -125,11 +125,6 @@ android {
125125

126126
compileSdkVersion rootProject.ext.compileSdkVersion
127127

128-
compileOptions {
129-
sourceCompatibility JavaVersion.VERSION_1_8
130-
targetCompatibility JavaVersion.VERSION_1_8
131-
}
132-
133128
defaultConfig {
134129
applicationId "com.awesomeproject"
135130
minSdkVersion rootProject.ext.minSdkVersion
@@ -215,7 +210,7 @@ dependencies {
215210
// Run this once to be able to run the application with BUCK
216211
// puts all compile dependencies into folder libs for BUCK to use
217212
task copyDownloadableDepsToLibs(type: Copy) {
218-
from configurations.compile
213+
from configurations.implementation
219214
into 'libs'
220215
}
221216

example/base/android/build.gradle

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,25 +2,26 @@
22

33
buildscript {
44
ext {
5-
buildToolsVersion = "29.0.3"
5+
buildToolsVersion = "30.0.2"
66
minSdkVersion = 21
7-
compileSdkVersion = 29
8-
targetSdkVersion = 29
7+
compileSdkVersion = 30
8+
targetSdkVersion = 30
99
ndkVersion = "20.1.5948944"
1010
}
1111
repositories {
1212
google()
13-
jcenter()
13+
mavenCentral()
1414
}
1515
dependencies {
16-
classpath("com.android.tools.build:gradle:4.1.0")
16+
classpath("com.android.tools.build:gradle:4.2.1")
1717
// NOTE: Do not place your application dependencies here; they belong
1818
// in the individual module build.gradle files
1919
}
2020
}
2121

2222
allprojects {
2323
repositories {
24+
mavenCentral()
2425
mavenLocal()
2526
maven {
2627
// All of React Native (JS, Obj-C sources, Android binaries) is installed from npm
@@ -32,7 +33,6 @@ allprojects {
3233
}
3334

3435
google()
35-
jcenter()
3636
maven { url 'https://www.jitpack.io' }
3737
}
3838
}

example/base/android/gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,4 +25,4 @@ android.useAndroidX=true
2525
android.enableJetifier=true
2626

2727
# Version of flipper SDK to use with React Native
28-
FLIPPER_VERSION=0.75.1
28+
FLIPPER_VERSION=0.93.0
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-all.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-6.9-all.zip
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists

example/base/ios/AwesomeProject.xcodeproj/project.pbxproj

Lines changed: 53 additions & 53 deletions
Large diffs are not rendered by default.

example/base/ios/AwesomeProject.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist

Lines changed: 0 additions & 8 deletions
This file was deleted.
Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,38 +1,38 @@
11
{
2-
"images": [
2+
"images" : [
33
{
4-
"idiom": "iphone",
5-
"size": "29x29",
6-
"scale": "2x"
4+
"idiom" : "iphone",
5+
"size" : "29x29",
6+
"scale" : "2x"
77
},
88
{
9-
"idiom": "iphone",
10-
"size": "29x29",
11-
"scale": "3x"
9+
"idiom" : "iphone",
10+
"size" : "29x29",
11+
"scale" : "3x"
1212
},
1313
{
14-
"idiom": "iphone",
15-
"size": "40x40",
16-
"scale": "2x"
14+
"idiom" : "iphone",
15+
"size" : "40x40",
16+
"scale" : "2x"
1717
},
1818
{
19-
"idiom": "iphone",
20-
"size": "40x40",
21-
"scale": "3x"
19+
"idiom" : "iphone",
20+
"size" : "40x40",
21+
"scale" : "3x"
2222
},
2323
{
24-
"idiom": "iphone",
25-
"size": "60x60",
26-
"scale": "2x"
24+
"idiom" : "iphone",
25+
"size" : "60x60",
26+
"scale" : "2x"
2727
},
2828
{
29-
"idiom": "iphone",
30-
"size": "60x60",
31-
"scale": "3x"
29+
"idiom" : "iphone",
30+
"size" : "60x60",
31+
"scale" : "3x"
3232
}
3333
],
34-
"info": {
35-
"version": 1,
36-
"author": "xcode"
34+
"info" : {
35+
"version" : 1,
36+
"author" : "xcode"
3737
}
38-
}
38+
}
Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
2-
"info": {
3-
"version": 1,
4-
"author": "xcode"
2+
"info" : {
3+
"version" : 1,
4+
"author" : "xcode"
55
}
66
}

example/base/ios/Podfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
require_relative '../node_modules/react-native/scripts/react_native_pods'
22
require_relative '../node_modules/@react-native-community/cli-platform-ios/native_modules'
33

4-
platform :ios, '10.0'
4+
platform :ios, '11.0'
55

66
target 'AwesomeProject' do
77
config = use_native_modules!
@@ -26,4 +26,4 @@ target 'AwesomeProject' do
2626
post_install do |installer|
2727
react_native_post_install(installer)
2828
end
29-
end
29+
end

0 commit comments

Comments
 (0)