Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: fix#176 Fresco 3.1.3 compatibility issues with RN 0.73.0, compileDebugKotlin FAILED #177

Merged
merged 4 commits into from
Dec 21, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 13 additions & 10 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Build and Test
name: CI
on:
pull_request:
types: [opened, synchronize, reopened]
Expand Down Expand Up @@ -43,7 +43,7 @@ jobs:
if: steps.verify-dev-changed-files.outputs.any_changed == 'true'
uses: actions/setup-node@v3
with:
node-version: '16'
node-version: '18'

- name: Install npm dependencies
if: steps.cache-node-modules.outputs.cache-hit != 'true' && steps.verify-dev-changed-files.outputs.any_changed == 'true'
Expand Down Expand Up @@ -74,7 +74,8 @@ jobs:
assets/**
package.json
!example/ios/**
example/e2e/**
- uses: actions/cache@v3
name: Cache node_modules
if: steps.verify-android-changed-files.outputs.any_changed == 'true'
Expand Down Expand Up @@ -107,14 +108,14 @@ jobs:
uses: actions/setup-node@v3
if: steps.verify-android-changed-files.outputs.any_changed == 'true'
with:
node-version: '16'
node-version: '18'

- name: Set up JDK
uses: actions/setup-java@v3
if: steps.verify-android-changed-files.outputs.any_changed == 'true'
with:
distribution: 'zulu'
java-version: 11
java-version: 17

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

android-test:
android-api-level-test:
runs-on: macos-latest
needs: android-build
name: Android Test
Expand All @@ -165,6 +166,7 @@ jobs:
assets/**
package.json
!example/ios/**
example/e2e/**
- uses: actions/cache@v3
name: Cache node_modules
Expand Down Expand Up @@ -199,14 +201,14 @@ jobs:
uses: actions/setup-node@v3
if: steps.verify-android-changed-files.outputs.any_changed == 'true'
with:
node-version: '16'
node-version: '18'

- name: Set up JDK
uses: actions/setup-java@v3
if: steps.verify-android-changed-files.outputs.any_changed == 'true'
with:
distribution: 'zulu'
java-version: 11
java-version: 17

- name: Instrumentation Tests
uses: reactivecircus/android-emulator-runner@v2
Expand Down Expand Up @@ -247,6 +249,7 @@ jobs:
assets/**
package.json
!example/android/**
example/e2e/**
- uses: actions/cache@v3
name: Cache node_modules
Expand Down Expand Up @@ -282,7 +285,7 @@ jobs:
if: steps.verify-iOS-changed-files.outputs.any_changed == 'true'
uses: actions/setup-node@v3
with:
node-version: '16'
node-version: '18'

- name: Install Pods
if: steps.cache-pods.outputs.cache-hit != 'true' && steps.verify-iOS-changed-files.outputs.any_changed == 'true'
Expand All @@ -309,7 +312,7 @@ jobs:
ci-complete:
name: Complete CI
needs: [android-build, android-test, ios-build-test]
needs: [android-build, android-api-level-test, ios-build-test]
if: ${{ always() }}
runs-on: ubuntu-latest
steps:
Expand Down
4 changes: 4 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ DerivedData
*.ipa
*.xcuserstate
project.xcworkspace
.xcode.env.local

# Android/IJ
#
Expand Down Expand Up @@ -72,3 +73,6 @@ android/keystores/debug.keystore
lib/

docs/**/*.html

# testing
/coverage
13 changes: 13 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,18 @@


# [1.2.0](https://github.com/JimmyDaddy/react-native-image-marker/compare/v1.1.8...v1.2.0) (2023-12-21)


### Bug Fixes

* 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))
* 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))


### Features

* use Coil instead of Fresco to load images on the Android platform ([4438127](https://github.com/JimmyDaddy/react-native-image-marker/commit/44381276fa2973782f839415f2b3e735d63f93fa))

## [1.1.11](https://github.com/JimmyDaddy/react-native-image-marker/compare/v1.1.8...v1.1.11) (2023-12-21)


Expand Down
Loading
Loading