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

lerna upgrade #75

Merged
merged 9 commits into from
Dec 16, 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
8 changes: 4 additions & 4 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ on:
workflow_dispatch:

env:
NODE_VERSION: 16
NODE_VERSION: 21.x
JAVA_VERSION: 17

# A workflow run is made up of one or more jobs that can run sequentially or in parallel
Expand All @@ -29,7 +29,7 @@ jobs:
uses: actions/setup-node@v3
with:
node-version: ${{ env.NODE_VERSION }}
- run: npm i
- run: npm ci
- run: npm run lint
verify-android:
name: Verify Android
Expand All @@ -47,7 +47,7 @@ jobs:
with:
distribution: 'zulu'
java-version: ${{ env.JAVA_VERSION }}
- run: npm i
- run: npm ci
- run: npm run verify:android

verify-ios:
Expand All @@ -61,5 +61,5 @@ jobs:
uses: actions/setup-node@v3
with:
node-version: ${{ env.NODE_VERSION }}
- run: npm i
- run: npm ci
- run: npm run verify:ios
1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
node_modules
.DS_Store
package-lock.json
Podfile.lock
.env
2 changes: 1 addition & 1 deletion appcenter-analytics/android/settings.gradle
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
include ':capacitor-android'
project(':capacitor-android').projectDir = new File('../node_modules/@capacitor/android/capacitor')
project(':capacitor-android').projectDir = new File('../../node_modules/@capacitor/android/capacitor')
4 changes: 2 additions & 2 deletions appcenter-analytics/ios/Podfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ platform :ios, '13.0'
def capacitor_pods
# Comment the next line if you're not using Swift and don't want to use dynamic frameworks
use_frameworks!
pod 'Capacitor', :path => '../node_modules/@capacitor/ios'
pod 'CapacitorCordova', :path => '../node_modules/@capacitor/ios'
pod 'Capacitor', :path => '../../node_modules/@capacitor/ios'
pod 'CapacitorCordova', :path => '../../node_modules/@capacitor/ios'
end

target 'Plugin' do
Expand Down
2 changes: 1 addition & 1 deletion appcenter-crashes/android/settings.gradle
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
include ':capacitor-android'
project(':capacitor-android').projectDir = new File('../node_modules/@capacitor/android/capacitor')
project(':capacitor-android').projectDir = new File('../../node_modules/@capacitor/android/capacitor')
4 changes: 2 additions & 2 deletions appcenter-crashes/ios/Podfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ platform :ios, '13.0'
def capacitor_pods
# Comment the next line if you're not using Swift and don't want to use dynamic frameworks
use_frameworks!
pod 'Capacitor', :path => '../node_modules/@capacitor/ios'
pod 'CapacitorCordova', :path => '../node_modules/@capacitor/ios'
pod 'Capacitor', :path => '../../node_modules/@capacitor/ios'
pod 'CapacitorCordova', :path => '../../node_modules/@capacitor/ios'
end

target 'Plugin' do
Expand Down
2 changes: 1 addition & 1 deletion appcenter/android/settings.gradle
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
include ':capacitor-android'
project(':capacitor-android').projectDir = new File('../node_modules/@capacitor/android/capacitor')
project(':capacitor-android').projectDir = new File('../../node_modules/@capacitor/android/capacitor')
4 changes: 2 additions & 2 deletions appcenter/ios/Podfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ platform :ios, '13.0'
def capacitor_pods
# Comment the next line if you're not using Swift and don't want to use dynamic frameworks
use_frameworks!
pod 'Capacitor', :path => '../node_modules/@capacitor/ios'
pod 'CapacitorCordova', :path => '../node_modules/@capacitor/ios'
pod 'Capacitor', :path => '../../node_modules/@capacitor/ios'
pod 'CapacitorCordova', :path => '../../node_modules/@capacitor/ios'
end

target 'Plugin' do
Expand Down
12 changes: 0 additions & 12 deletions lerna.json
Original file line number Diff line number Diff line change
@@ -1,15 +1,3 @@
{
"packages": [
"appcenter",
"appcenter-analytics",
"appcenter-crashes",
"example"
],
"command": {
"bootstrap": {
"ci": false,
"npmClientArgs": ["--no-package-lock"]
}
},
"version": "independent"
}
Loading