Skip to content

feat!: Capacitor version 6 dependency update #51

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

Merged
merged 42 commits into from
Jun 25, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
42 commits
Select commit Hold shift + click to select a range
8ba3390
updated android dependency versions
carlpoole Apr 25, 2024
5100250
ios version
carlpoole Apr 25, 2024
54cc098
Update iOS code
Steven0351 Jun 4, 2024
ab44a30
Lots of updates
trevor-lambert Jun 13, 2024
a37ca75
Project cleanup
Steven0351 Jun 17, 2024
5dac210
Please don't be broken
Steven0351 Jun 17, 2024
0576324
chore(example): fix ios example
Steven0351 Jun 17, 2024
fa4d2eb
feat: android working, web vitals implementation updated
trevor-lambert Jun 18, 2024
d3fcd92
feat: oops
trevor-lambert Jun 19, 2024
b0f3529
feat: webVitals for iOS
trevor-lambert Jun 20, 2024
47ec28d
feat: ci change
trevor-lambert Jun 20, 2024
58039e1
feat: ci change 2
trevor-lambert Jun 20, 2024
d767112
feat: ci change 3
trevor-lambert Jun 20, 2024
aacbef7
chore: disable eslint for App example
trevor-lambert Jun 20, 2024
260f306
chore: install portals cli
trevor-lambert Jun 20, 2024
d679ae9
chore: exclude example
trevor-lambert Jun 20, 2024
ad2e2ea
chore: build web app
trevor-lambert Jun 20, 2024
890efd0
chore: asdf
trevor-lambert Jun 20, 2024
a52d44f
chore: asdff
trevor-lambert Jun 20, 2024
7138c7b
chore: yarn stuff
trevor-lambert Jun 20, 2024
a9c117b
chore: asdlkfj
trevor-lambert Jun 20, 2024
cb5579d
chore: add web
trevor-lambert Jun 20, 2024
283086f
chore: asdf
trevor-lambert Jun 20, 2024
7872913
chore: asdf
trevor-lambert Jun 20, 2024
24f7c7f
chore: eslint stuff
trevor-lambert Jun 21, 2024
277b3fc
chore: tsconfig build stuff
trevor-lambert Jun 21, 2024
efc1cb1
chore: please pass
trevor-lambert Jun 21, 2024
7a5c9f5
chore: remove corepack from action
trevor-lambert Jun 21, 2024
2fbb5c4
chore: remove corepack from action 2
trevor-lambert Jun 21, 2024
295b6cb
chore: upgrade actions
trevor-lambert Jun 21, 2024
e25f6df
chore: upgrade actions 2
trevor-lambert Jun 21, 2024
50a0c48
chore: android fix
trevor-lambert Jun 21, 2024
ec6a4f8
chore: upgrade
trevor-lambert Jun 21, 2024
411b761
chore: asdf
trevor-lambert Jun 21, 2024
a9eb149
chore: upgrade more stuff
trevor-lambert Jun 21, 2024
ec1fa01
chore: deprecate web stuff
trevor-lambert Jun 21, 2024
6c9cbdd
chore: update vercelignore
Steven0351 Jun 21, 2024
f2bcb92
chore: try removing from .gitignore instead
Steven0351 Jun 21, 2024
8a3217d
chore: update JSDoc deprecation comments
Steven0351 Jun 21, 2024
d765477
chore: remove stock generated README from example
Steven0351 Jun 24, 2024
364737e
chore: revert kotlin, compile, and target sdk versions
Steven0351 Jun 24, 2024
33ee2f0
chore: actually set android.useAndroidX to true
Steven0351 Jun 24, 2024
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
7 changes: 0 additions & 7 deletions .eslintignore

This file was deleted.

38 changes: 38 additions & 0 deletions .github/actions/setup/action.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
name: Setup
description: Setup Node.js and install dependencies

runs:
using: composite
steps:
- name: Setup Node.js
uses: actions/setup-node@v4
with:
node-version-file: .nvmrc

- run: curl -sL https://raw.githubusercontent.com/ionic-team/portals-cli-releases/main/install.sh | bash
shell: bash

# Caching was causing broken builds. Disabled for now.
# - name: Cache dependencies
# id: yarn-cache
# uses: actions/cache@v3
# with:
# path: |
# **/node_modules
# .yarn/install-state.gz
# key: ${{ runner.os }}-yarn-${{ hashFiles('yarn.lock') }}-${{ hashFiles('**/package.json', '!node_modules/**') }}
# restore-keys: |
# ${{ runner.os }}-yarn-${{ hashFiles('yarn.lock') }}
# ${{ runner.os }}-yarn-

- name: Install dependencies
# if: steps.yarn-cache.outputs.cache-hit != 'true'
run: yarn install --immutable
shell: bash

- name: Build example web app
run: |
yarn install --immutable
yarn build
shell: bash
working-directory: web
154 changes: 154 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,154 @@
name: CI
on:
push:
branches:
- "*"
pull_request:
branches:
- main

jobs:
lint:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v4

- name: Setup
uses: ./.github/actions/setup

- name: Lint files
run: yarn lint

- name: Typecheck files
run: yarn typecheck

# test:
# runs-on: ubuntu-latest
# steps:
# - name: Checkout
# uses: actions/checkout@v4

# - name: Setup
# uses: ./.github/actions/setup

# - name: Run unit tests
# run: yarn test --maxWorkers=2 --coverage

build-library:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v4

- name: Setup
uses: ./.github/actions/setup

- name: Build package
run: yarn prepare

build-android:
runs-on: ubuntu-latest
env:
TURBO_CACHE_DIR: .turbo/android
steps:
- name: Checkout
uses: actions/checkout@v4

- name: Setup
uses: ./.github/actions/setup

- name: Cache turborepo for Android
uses: actions/cache@v4
with:
path: ${{ env.TURBO_CACHE_DIR }}
key: ${{ runner.os }}-turborepo-android-${{ hashFiles('yarn.lock') }}
restore-keys: |
${{ runner.os }}-turborepo-android-

- name: Check turborepo cache for Android
run: |
TURBO_CACHE_STATUS=$(node -p "($(yarn turbo run build:android --cache-dir="${{ env.TURBO_CACHE_DIR }}" --dry=json)).tasks.find(t => t.task === 'build:android').cache.status")

if [[ $TURBO_CACHE_STATUS == "HIT" ]]; then
echo "turbo_cache_hit=1" >> $GITHUB_ENV
fi

- name: Install JDK
if: env.turbo_cache_hit != 1
uses: actions/setup-java@v3
with:
distribution: 'zulu'
java-version: '17'

- name: Finalize Android SDK
if: env.turbo_cache_hit != 1
run: |
/bin/bash -c "yes | $ANDROID_HOME/cmdline-tools/latest/bin/sdkmanager --licenses > /dev/null"

- name: Cache Gradle
if: env.turbo_cache_hit != 1
uses: actions/cache@v4
with:
path: |
~/.gradle/wrapper
~/.gradle/caches
key: ${{ runner.os }}-gradle-${{ hashFiles('example/android/gradle/wrapper/gradle-wrapper.properties') }}
restore-keys: |
${{ runner.os }}-gradle-

- name: Build example for Android
env:
JAVA_OPTS: "-XX:MaxHeapSize=6g"
run: |
yarn turbo run build:android --cache-dir="${{ env.TURBO_CACHE_DIR }}"

build-ios:
runs-on: macos-14
env:
TURBO_CACHE_DIR: .turbo/ios
steps:
- name: Checkout
uses: actions/checkout@v4

- name: Setup
uses: ./.github/actions/setup

- name: Cache turborepo for iOS
uses: actions/cache@v4
with:
path: ${{ env.TURBO_CACHE_DIR }}
key: ${{ runner.os }}-turborepo-ios-${{ hashFiles('yarn.lock') }}
restore-keys: |
${{ runner.os }}-turborepo-ios-

- name: Check turborepo cache for iOS
run: |
TURBO_CACHE_STATUS=$(node -p "($(yarn turbo run build:ios --cache-dir="${{ env.TURBO_CACHE_DIR }}" --dry=json)).tasks.find(t => t.task === 'build:ios').cache.status")

if [[ $TURBO_CACHE_STATUS == "HIT" ]]; then
echo "turbo_cache_hit=1" >> $GITHUB_ENV
fi

- name: Cache cocoapods
if: env.turbo_cache_hit != 1
id: cocoapods-cache
uses: actions/cache@v4
with:
path: |
**/ios/Pods
key: ${{ runner.os }}-cocoapods-${{ hashFiles('example/ios/Podfile.lock') }}
restore-keys: |
${{ runner.os }}-cocoapods-

- name: Install cocoapods
if: env.turbo_cache_hit != 1 && steps.cocoapods-cache.outputs.cache-hit != 'true'
run: |
cd example/ios
pod install
env:
NO_FLIPPER: 1

- name: Build example for iOS
run: |
yarn turbo run build:ios --cache-dir="${{ env.TURBO_CACHE_DIR }}"
39 changes: 19 additions & 20 deletions .github/workflows/pre-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,28 +3,27 @@ name: Pre-Release
on:
push:
branches:
- 'release/**'
- "release/**"

jobs:
increment-version:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/setup-node@v1
with:
node-version: 14.x
- name: Assign version to RELEASE_VERSION environment variable
run: echo "RELEASE_VERSION=${GITHUB_REF#refs/*/*/}" >> $GITHUB_ENV
- name: Bump npm package version
run: npm version $RELEASE_VERSION --no-git-tag-version
env:
NPM_TOKEN: ${{ secrets.NPM_PUBLISH_TOKEN }}
- name: Push version bump commit
uses: EndBug/add-and-commit@v9
- name: Validate Publish Flow
run: |
npm install
npm publish --dry-run
env:
NPM_TOKEN: ${{ secrets.NPM_PUBLISH_TOKEN }}

- uses: actions/checkout@v4
- uses: actions/setup-node@v4
with:
node-version-file: .nvmrc
- name: Assign version to RELEASE_VERSION environment variable
run: echo "RELEASE_VERSION=${GITHUB_REF#refs/*/*/}" >> $GITHUB_ENV
- name: Bump npm package version
run: yarn version $RELEASE_VERSION --no-git-tag-version
env:
NPM_TOKEN: ${{ secrets.NPM_PUBLISH_TOKEN }}
- name: Push version bump commit
uses: EndBug/add-and-commit@v9
- name: Validate Publish Flow
run: |
yarn install --immutable
yarn pack --dry-run
env:
NPM_TOKEN: ${{ secrets.NPM_PUBLISH_TOKEN }}
22 changes: 11 additions & 11 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,19 +3,19 @@ name: Publish NPM Package
on:
push:
tags:
- '*'
- "*"

jobs:
publish-to-npm:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/setup-node@v1
with:
node-version: 14.x
- name: Publish package
run: |
npm install
npm publish
env:
NPM_TOKEN: ${{ secrets.NPM_PUBLISH_TOKEN }}
- uses: actions/checkout@v4
- uses: actions/setup-node@v4
with:
node-version-file: .nvmrc
- name: Publish package
run: |
yarn install --immutable
yarn npm publish
env:
NPM_TOKEN: ${{ secrets.NPM_PUBLISH_TOKEN }}
24 changes: 0 additions & 24 deletions .github/workflows/verify.yml

This file was deleted.

8 changes: 8 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -73,3 +73,11 @@ example/android/app/src/main/assets
docs/

package-lock.json

**/.yarn/*
.xcode.env.local

!.yarn/releases/
!.yarn/plugins/
.turbo/
coverage/
1 change: 0 additions & 1 deletion .husky/.npmignore

This file was deleted.

4 changes: 0 additions & 4 deletions .husky/commit-msg

This file was deleted.

4 changes: 0 additions & 4 deletions .husky/pre-commit

This file was deleted.

1 change: 1 addition & 0 deletions .nvmrc
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
v18
1 change: 0 additions & 1 deletion .vercelignore
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
docs/
.github/
example/
node_modules/
*.tgz
1 change: 1 addition & 0 deletions .watchmanconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{}
Loading