Skip to content

Commit 06d65c4

Browse files
authored
fix: fix#176 Fresco 3.1.3 compatibility issues with RN 0.73.0, compileDebugKotlin FAILED (#177)
* fix: fix#176 Fresco 3.1.3 compatibility issues with RN 0.73.0, compileDebugKotlin FAILED * feat: use Coil instead of Fresco to load images on the Android platform * chore: update docs * chore: release 1.2.0
1 parent 10d71e1 commit 06d65c4

File tree

39 files changed

+2260
-732
lines changed

39 files changed

+2260
-732
lines changed

.github/workflows/ci.yml

Lines changed: 13 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: Build and Test
1+
name: CI
22
on:
33
pull_request:
44
types: [opened, synchronize, reopened]
@@ -43,7 +43,7 @@ jobs:
4343
if: steps.verify-dev-changed-files.outputs.any_changed == 'true'
4444
uses: actions/setup-node@v3
4545
with:
46-
node-version: '16'
46+
node-version: '18'
4747

4848
- name: Install npm dependencies
4949
if: steps.cache-node-modules.outputs.cache-hit != 'true' && steps.verify-dev-changed-files.outputs.any_changed == 'true'
@@ -74,7 +74,8 @@ jobs:
7474
assets/**
7575
package.json
7676
!example/ios/**
77-
77+
example/e2e/**
78+
7879
- uses: actions/cache@v3
7980
name: Cache node_modules
8081
if: steps.verify-android-changed-files.outputs.any_changed == 'true'
@@ -107,14 +108,14 @@ jobs:
107108
uses: actions/setup-node@v3
108109
if: steps.verify-android-changed-files.outputs.any_changed == 'true'
109110
with:
110-
node-version: '16'
111+
node-version: '18'
111112

112113
- name: Set up JDK
113114
uses: actions/setup-java@v3
114115
if: steps.verify-android-changed-files.outputs.any_changed == 'true'
115116
with:
116117
distribution: 'zulu'
117-
java-version: 11
118+
java-version: 17
118119

119120
- name: Install Gradle dependencies
120121
if: steps.cache-gradle.outputs.cache-hit != 'true' && steps.verify-android-changed-files.outputs.any_changed == 'true'
@@ -143,7 +144,7 @@ jobs:
143144
name: app-release-${{ github.sha }}.apk
144145
path: ${{ github.workspace }}/example/android/app-release-${{ github.sha }}.apk
145146

146-
android-test:
147+
android-api-level-test:
147148
runs-on: macos-latest
148149
needs: android-build
149150
name: Android Test
@@ -165,6 +166,7 @@ jobs:
165166
assets/**
166167
package.json
167168
!example/ios/**
169+
example/e2e/**
168170
169171
- uses: actions/cache@v3
170172
name: Cache node_modules
@@ -199,14 +201,14 @@ jobs:
199201
uses: actions/setup-node@v3
200202
if: steps.verify-android-changed-files.outputs.any_changed == 'true'
201203
with:
202-
node-version: '16'
204+
node-version: '18'
203205

204206
- name: Set up JDK
205207
uses: actions/setup-java@v3
206208
if: steps.verify-android-changed-files.outputs.any_changed == 'true'
207209
with:
208210
distribution: 'zulu'
209-
java-version: 11
211+
java-version: 17
210212

211213
- name: Instrumentation Tests
212214
uses: reactivecircus/android-emulator-runner@v2
@@ -247,6 +249,7 @@ jobs:
247249
assets/**
248250
package.json
249251
!example/android/**
252+
example/e2e/**
250253
251254
- uses: actions/cache@v3
252255
name: Cache node_modules
@@ -282,7 +285,7 @@ jobs:
282285
if: steps.verify-iOS-changed-files.outputs.any_changed == 'true'
283286
uses: actions/setup-node@v3
284287
with:
285-
node-version: '16'
288+
node-version: '18'
286289

287290
- name: Install Pods
288291
if: steps.cache-pods.outputs.cache-hit != 'true' && steps.verify-iOS-changed-files.outputs.any_changed == 'true'
@@ -309,7 +312,7 @@ jobs:
309312
310313
ci-complete:
311314
name: Complete CI
312-
needs: [android-build, android-test, ios-build-test]
315+
needs: [android-build, android-api-level-test, ios-build-test]
313316
if: ${{ always() }}
314317
runs-on: ubuntu-latest
315318
steps:

.gitignore

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ DerivedData
2828
*.ipa
2929
*.xcuserstate
3030
project.xcworkspace
31+
.xcode.env.local
3132

3233
# Android/IJ
3334
#
@@ -72,3 +73,6 @@ android/keystores/debug.keystore
7273
lib/
7374

7475
docs/**/*.html
76+
77+
# testing
78+
/coverage

CHANGELOG.md

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,18 @@
11

22

3+
# [1.2.0](https://github.com/JimmyDaddy/react-native-image-marker/compare/v1.1.8...v1.2.0) (2023-12-21)
4+
5+
6+
### Bug Fixes
7+
8+
* fix [#164](https://github.com/JimmyDaddy/react-native-image-marker/issues/164) Build Failure on CI Due to CocoaPods 1.1.9 in iOS Project ([#165](https://github.com/JimmyDaddy/react-native-image-marker/issues/165)) ([532e8a4](https://github.com/JimmyDaddy/react-native-image-marker/commit/532e8a4d325fd1c30315eac0f1ab81fbf81c144f))
9+
* fix[#176](https://github.com/JimmyDaddy/react-native-image-marker/issues/176) Fresco 3.1.3 compatibility issues with RN 0.73.0, compileDebugKotlin FAILED ([2fd4fef](https://github.com/JimmyDaddy/react-native-image-marker/commit/2fd4feff34e3bf9ada3de0dbb6f9789facbd0500))
10+
11+
12+
### Features
13+
14+
* use Coil instead of Fresco to load images on the Android platform ([4438127](https://github.com/JimmyDaddy/react-native-image-marker/commit/44381276fa2973782f839415f2b3e735d63f93fa))
15+
316
## [1.1.11](https://github.com/JimmyDaddy/react-native-image-marker/compare/v1.1.8...v1.1.11) (2023-12-21)
417

518

0 commit comments

Comments
 (0)