Skip to content

Commit 2257778

Browse files
committed
Merge remote-tracking branch 'upstream/main'
* upstream/main: release(version): Release 8.5.11 [skip ci] fix: null exception in FastImageViewManager.java (DylanVann#423) release(version): Release 8.5.10 [skip ci] chore: convert examples to hooks (DylanVann#830) release(version): Release 8.5.9 [skip ci] fix: FastImage extends ViewProps (DylanVann#829) ci: update CI and (re)enable coverage (DylanVann#826) [skip ci] release(version): Release 8.5.8 [skip ci] docs: fix gifs release(version): Release 8.5.7 [skip ci] chore: upgrade example to [email protected] release(version): Release 8.5.6 [skip ci] fix: make corresponding flow file for .cjs file
2 parents e922040 + 4d8c749 commit 2257778

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+1545
-1589
lines changed

.github/workflows/ci.yml

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
name: ci
2+
on: [push, pull_request]
3+
jobs:
4+
build:
5+
runs-on: ubuntu-latest
6+
steps:
7+
- uses: actions/checkout@v2
8+
- uses: actions/setup-node@v2
9+
- run: yarn --frozen-lockfile
10+
- run: yarn build
11+
- run: yarn test --coverage
12+
- if: github.event.repository.fork == false && github.event_name != 'pull_request'
13+
run: yarn dv-scripts ci
14+
env:
15+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
16+
NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
17+
- uses: codecov/codecov-action@v2

.github/workflows/main.yml

Lines changed: 0 additions & 37 deletions
This file was deleted.

CHANGELOG.md

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,30 @@
1+
## [8.5.11](https://github.com/DylanVann/react-native-fast-image/compare/v8.5.10...v8.5.11) (2021-09-27)
2+
3+
4+
### Bug Fixes
5+
6+
* null exception in FastImageViewManager.java ([#423](https://github.com/DylanVann/react-native-fast-image/issues/423)) ([a7a8643](https://github.com/DylanVann/react-native-fast-image/commit/a7a8643ed4988f3726a8ac8a0256f4d4ca3feb6f))
7+
8+
## [8.5.10](https://github.com/DylanVann/react-native-fast-image/compare/v8.5.9...v8.5.10) (2021-09-27)
9+
10+
## [8.5.9](https://github.com/DylanVann/react-native-fast-image/compare/v8.5.8...v8.5.9) (2021-09-27)
11+
12+
13+
### Bug Fixes
14+
15+
* FastImage extends ViewProps ([#829](https://github.com/DylanVann/react-native-fast-image/issues/829)) ([68db871](https://github.com/DylanVann/react-native-fast-image/commit/68db8712bff865e6b5464b02c956d5198529a2f7)), closes [#819](https://github.com/DylanVann/react-native-fast-image/issues/819)
16+
17+
## [8.5.8](https://github.com/DylanVann/react-native-fast-image/compare/v8.5.7...v8.5.8) (2021-09-17)
18+
19+
## [8.5.7](https://github.com/DylanVann/react-native-fast-image/compare/v8.5.6...v8.5.7) (2021-09-17)
20+
21+
## [8.5.6](https://github.com/DylanVann/react-native-fast-image/compare/v8.5.5...v8.5.6) (2021-09-16)
22+
23+
24+
### Bug Fixes
25+
26+
* make corresponding flow file for .cjs file ([77326e8](https://github.com/DylanVann/react-native-fast-image/commit/77326e8b09954ab8c27785fe84427b1ed3d9290f)), closes [#784](https://github.com/DylanVann/react-native-fast-image/issues/784)
27+
128
## [8.5.5](https://github.com/DylanVann/react-native-fast-image/compare/v8.5.4...v8.5.5) (2021-09-15)
229

330

README.md

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,18 @@ Performant React Native image component.
1919

2020
<p align="center" >
2121
<kbd>
22-
<img src="https://github.com/DylanVann/react-native-fast-image/raw/master/docs/assets/scroll.gif" title="Scroll Demo" float="left">
22+
<img
23+
src="https://github.com/DylanVann/react-native-fast-image/blob/main/docs/assets/scroll.gif?raw=true"
24+
title="Scroll Demo"
25+
float="left"
26+
>
2327
</kbd>
2428
<kbd>
25-
<img src="https://github.com/DylanVann/react-native-fast-image/raw/master/docs/assets/priority.gif" title="Priority Demo" float="left">
29+
<img
30+
src="https://github.com/DylanVann/react-native-fast-image/blob/main/docs/assets/priority.gif?raw=true"
31+
title="Priority Demo"
32+
float="left"
33+
>
2634
</kbd>
2735
<br>
2836
<em>FastImage example app.</em>
Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
module.exports = {
2-
root: true,
3-
extends: '@react-native-community',
4-
rules: {
5-
semi: ['error', 'never'],
6-
},
2+
root: true,
3+
extends: '@react-native-community',
4+
rules: {
5+
semi: ['error', 'never'],
6+
'react-native/no-inline-styles': 'off',
7+
},
78
}

ReactNativeFastImageExample/.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ build/
2828
.gradle
2929
local.properties
3030
*.iml
31+
*.hprof
3132

3233
# node.js
3334
#
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{}
1+
{}

ReactNativeFastImageExample/__tests__/App-test.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,5 +10,5 @@ import App from '../src'
1010
import renderer from 'react-test-renderer'
1111

1212
it('renders correctly', () => {
13-
renderer.create(<App />)
13+
renderer.create(<App />)
1414
})

ReactNativeFastImageExample/android/app/build.gradle

Lines changed: 5 additions & 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.reactnativefastimageexample"
135130
minSdkVersion rootProject.ext.minSdkVersion
@@ -215,9 +210,13 @@ 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

222217
apply from: file("../../node_modules/@react-native-community/cli-platform-android/native_modules.gradle"); applyNativeModulesAppBuildGradle(project)
218+
project.ext.vectoricons = [
219+
iconFontNames: [ 'Ionicons.ttf'] // Name of the font files you want to copy
220+
]
221+
223222
apply from: "../../node_modules/react-native-vector-icons/fonts.gradle"

ReactNativeFastImageExample/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
}

0 commit comments

Comments
 (0)