Skip to content

Commit

Permalink
chore: update dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
ratson committed Apr 8, 2024
1 parent a5c1bfc commit 771f3f3
Show file tree
Hide file tree
Showing 21 changed files with 1,328 additions and 3,184 deletions.
4 changes: 2 additions & 2 deletions examples/capacitor/android/build.gradle
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
// Top-level build file where you can add configuration options common to all sub-projects/modules.

buildscript {

ext {
kotlin_version = '1.8.21'
kotlin_version = '1.9.23'
}
repositories {
google()
Expand Down
6 changes: 3 additions & 3 deletions examples/capacitor/android/capacitor.settings.gradle
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
// DO NOT EDIT THIS FILE! IT IS GENERATED EACH TIME "capacitor update" IS RUN
include ':capacitor-android'
project(':capacitor-android').projectDir = new File('../../../node_modules/.pnpm/@capacitor+android@5.5.1_@capacitor+core@5.5.1/node_modules/@capacitor/android/capacitor')
project(':capacitor-android').projectDir = new File('../../../node_modules/.pnpm/@capacitor+android@5.7.4_@capacitor+core@5.7.4/node_modules/@capacitor/android/capacitor')

include ':admob-plus-capacitor'
project(':admob-plus-capacitor').projectDir = new File('../../../packages/capacitor/android')

include ':capacitor-camera'
project(':capacitor-camera').projectDir = new File('../../../node_modules/.pnpm/@capacitor+camera@5.0.7_@capacitor+core@5.5.1/node_modules/@capacitor/camera/android')
project(':capacitor-camera').projectDir = new File('../../../node_modules/.pnpm/@capacitor+camera@5.0.9_@capacitor+core@5.7.4/node_modules/@capacitor/camera/android')

include ':capacitor-splash-screen'
project(':capacitor-splash-screen').projectDir = new File('../../../node_modules/.pnpm/@capacitor+splash-screen@5.0.6_@capacitor+core@5.5.1/node_modules/@capacitor/splash-screen/android')
project(':capacitor-splash-screen').projectDir = new File('../../../node_modules/.pnpm/@capacitor+splash-screen@5.0.7_@capacitor+core@5.7.4/node_modules/@capacitor/splash-screen/android')
10 changes: 5 additions & 5 deletions examples/capacitor/ios/App/Podfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
require_relative '../../../../node_modules/.pnpm/@capacitor+ios@5.5.1_@capacitor+core@5.5.1/node_modules/@capacitor/ios/scripts/pods_helpers'
require_relative '../../../../node_modules/.pnpm/@capacitor+ios@5.7.4_@capacitor+core@5.7.4/node_modules/@capacitor/ios/scripts/pods_helpers'

platform :ios, '13.0'
use_frameworks!
Expand All @@ -9,11 +9,11 @@ use_frameworks!
install! 'cocoapods', :disable_input_output_paths => true

def capacitor_pods
pod 'Capacitor', :path => '../../../../node_modules/.pnpm/@capacitor+ios@5.5.1_@capacitor+core@5.5.1/node_modules/@capacitor/ios'
pod 'CapacitorCordova', :path => '../../../../node_modules/.pnpm/@capacitor+ios@5.5.1_@capacitor+core@5.5.1/node_modules/@capacitor/ios'
pod 'Capacitor', :path => '../../../../node_modules/.pnpm/@capacitor+ios@5.7.4_@capacitor+core@5.7.4/node_modules/@capacitor/ios'
pod 'CapacitorCordova', :path => '../../../../node_modules/.pnpm/@capacitor+ios@5.7.4_@capacitor+core@5.7.4/node_modules/@capacitor/ios'
pod 'AdmobPlusCapacitor', :path => '../../../../packages/capacitor'
pod 'CapacitorCamera', :path => '../../../../node_modules/.pnpm/@capacitor+camera@5.0.7_@capacitor+core@5.5.1/node_modules/@capacitor/camera'
pod 'CapacitorSplashScreen', :path => '../../../../node_modules/.pnpm/@capacitor+splash-screen@5.0.6_@capacitor+core@5.5.1/node_modules/@capacitor/splash-screen'
pod 'CapacitorCamera', :path => '../../../../node_modules/.pnpm/@capacitor+camera@5.0.9_@capacitor+core@5.7.4/node_modules/@capacitor/camera'
pod 'CapacitorSplashScreen', :path => '../../../../node_modules/.pnpm/@capacitor+splash-screen@5.0.7_@capacitor+core@5.7.4/node_modules/@capacitor/splash-screen'
end

target 'App' do
Expand Down
12 changes: 6 additions & 6 deletions examples/capacitor/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,14 @@
},
"dependencies": {
"@admob-plus/capacitor": "workspace:*",
"@capacitor/android": "^5.5.1",
"@capacitor/camera": "^5.0.7",
"@capacitor/core": "^5.5.1",
"@capacitor/ios": "^5.5.1",
"@capacitor/splash-screen": "^5.0.6"
"@capacitor/android": "^5.7.4",
"@capacitor/camera": "^5.0.9",
"@capacitor/core": "^5.7.4",
"@capacitor/ios": "^5.7.4",
"@capacitor/splash-screen": "^5.0.7"
},
"devDependencies": {
"@capacitor/cli": "^5.5.1",
"@capacitor/cli": "^5.7.4",
"vite": "^2.9.13"
}
}
2 changes: 1 addition & 1 deletion examples/cordova-consent/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"devDependencies": {
"@types/cordova": "^11.0.3",
"cordova-android": "^12.0.1",
"cordova-ios": "^6.3.0",
"cordova-ios": "^7.1.0",
"cordova": "^12.0.0"
},
"cordova": {
Expand Down
2 changes: 1 addition & 1 deletion examples/cordova/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"admob-plus-cordova-native": "../../packages/cordova-native",
"cordova-android": "12.0.1",
"cordova-browser": "7.0.0",
"cordova-ios": "7.0.1",
"cordova-ios": "7.1.0",
"cordova": "^12.0.0",
"cordova-plus": "^0.9.4"
},
Expand Down
26 changes: 13 additions & 13 deletions examples/playground/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,11 @@
"test-android": "nx build && cordova prepare && cd platforms/android && ./gradlew check"
},
"dependencies": {
"@mantine/code-highlight": "^7.6.2",
"@mantine/core": "^7.6.2",
"@mantine/form": "^7.6.2",
"@mantine/hooks": "^7.6.2",
"@mantine/nprogress": "^7.6.2",
"@mantine/code-highlight": "^7.7.1",
"@mantine/core": "^7.7.1",
"@mantine/form": "^7.7.1",
"@mantine/hooks": "^7.7.1",
"@mantine/nprogress": "^7.7.1",
"@preact/signals-react": "^2.0.1",
"@tabler/icons-react": "^3.1.0",
"lodash": "^4.17.21",
Expand All @@ -28,11 +28,11 @@
"devDependencies": {
"@admob-plus-internal/npm-bin": "workspace:*",
"@types/fs-extra": "^11.0.4",
"@types/react": "^18.2.70",
"@types/react-dom": "^18.2.22",
"@types/react": "^18.2.74",
"@types/react-dom": "^18.2.24",
"@types/react-timeago": "^4.1.7",
"@typescript-eslint/eslint-plugin": "^7.4.0",
"@typescript-eslint/parser": "^7.4.0",
"@typescript-eslint/eslint-plugin": "^7.5.0",
"@typescript-eslint/parser": "^7.5.0",
"@vitejs/plugin-react": "^4.2.1",
"admob-plus": "workspace:*",
"admob-plus-cordova": "../../packages/cordova",
Expand All @@ -42,16 +42,16 @@
"cordova": "^12.0.0",
"cordova-android": "^12.0.1",
"cordova-browser": "^7.0.0",
"cordova-ios": "^7.0.1",
"cordova-ios": "^7.1.0",
"cordova-plugin-consent": "../../packages/cordova-consent",
"cordova-plus": "^0.9.4",
"eslint": "^8.57.0",
"eslint-plugin-react-hooks": "^4.6.0",
"eslint-plugin-react-refresh": "^0.4.6",
"fs-extra": "^11.2.0",
"tsx": "^4.7.1",
"typescript": "^5.4.3",
"vite": "^5.2.6"
"tsx": "^4.7.2",
"typescript": "^5.4.4",
"vite": "^5.2.8"
},
"cordova": {
"platforms": [
Expand Down
73 changes: 14 additions & 59 deletions flake.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

17 changes: 10 additions & 7 deletions flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@
flakelight ./. {
inherit inputs;

systems = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" ];

devShell = { inputs', pkgs, stdenv, lib, ... }:
let
pkgs-stable = inputs'.nixpkgs-stable.legacyPackages;
Expand All @@ -12,18 +14,19 @@
go-task
lychee
] ++ [
bundletool
(bundletool.overrideAttrs (attrs: {
postInstall = ''
ln -s "$src" $out/bin/bundletool.jar
'';
}))
ffmpeg
gst_all_1.gstreamer
opencv
(writeShellScriptBin "bundletool.jar" ''
exec bundletool "$@"
'')
] ++ (with nodePackages; [
nodejs
pnpm
]) ++ lib.optionals stdenv.isDarwin [
pkgs-stable.cocoapods
cocoapods
];

OPENCV4NODEJS_DISABLE_AUTOBUILD = "1";
Expand All @@ -33,9 +36,9 @@
inputs = {
nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
nixpkgs-stable.url = "github:NixOS/nixpkgs/768e0cf423e18cb56eb321f7b73609904d8f1611";
flake-parts = {
flakelight = {
url = "github:nix-community/flakelight";
inputs.nixpkgs-lib.follows = "nixpkgs";
inputs.nixpkgs.follows = "nixpkgs";
};
};
}
14 changes: 7 additions & 7 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,14 +21,14 @@
"@admob-plus-internal/cli": "workspace:*",
"@admob-plus-internal/npm-bin": "workspace:*",
"@admob-plus-internal/tsconfig": "workspace:*",
"@biomejs/biome": "1.6.3",
"@biomejs/biome": "1.6.4",
"@commitlint/cli": "19.2.1",
"@commitlint/config-conventional": "19.1.0",
"@commitlint/config-lerna-scopes": "19.0.0",
"@commitlint/prompt-cli": "19.2.0",
"@nrwl/node": "18.1.3",
"@nrwl/workspace": "18.1.3",
"@types/node": "^20.11.30",
"@nrwl/node": "18.2.3",
"@nrwl/workspace": "18.2.3",
"@types/node": "^20.12.5",
"admob-plus": "workspace:*",
"appium": "^2.5.1",
"appium-doctor": "^1.16.2",
Expand All @@ -39,13 +39,13 @@
"eslint-plugin-react-hooks": "^4.6.0",
"eslint-plugin-react-refresh": "^0.4.6",
"gts": "^5.3.0",
"happy-dom": "^14.3.9",
"happy-dom": "^14.7.1",
"is-ci": "^3.0.1",
"lerna": "^8.1.2",
"lint-staged": "^15.2.2",
"mjpeg-consumer": "^2.0.0",
"npm-run-all": "^4.1.5",
"nx": "18.1.3",
"nx": "18.2.3",
"remark-cli": "^12.0.0",
"remark-lint-are-links-valid-duplicate": "^0.2.2",
"remark-lint-heading-whitespace": "^1.0.0",
Expand All @@ -57,7 +57,7 @@
"simple-git-hooks": "^2.11.1",
"swiftlint": "^1.0.2",
"ts-node": "^10.9.2",
"typescript": "~5.4.3",
"typescript": "~5.4.4",
"vitest": "^1.4.0"
},
"repository": "admob-plus/admob-plus",
Expand Down
2 changes: 1 addition & 1 deletion packages/capacitor/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ You can find the documentation [on the website](https://admob-plus.github.io/doc
* [`adHide(...)`](#adhide)
* [`trackingAuthorizationStatus()`](#trackingauthorizationstatus)
* [`requestTrackingAuthorization()`](#requesttrackingauthorization)
* [`addListener(string, ...)`](#addlistenerstring)
* [`addListener(string, ...)`](#addlistenerstring-)
* [Interfaces](#interfaces)
* [Type Aliases](#type-aliases)
* [Enums](#enums)
Expand Down
12 changes: 6 additions & 6 deletions packages/capacitor/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -48,14 +48,14 @@
"test": "tsc --noEmit"
},
"devDependencies": {
"@capacitor/android": "^5.0.5",
"@capacitor/core": "^5.0.5",
"@capacitor/docgen": "^0.2.1",
"@capacitor/ios": "^5.0.5",
"@capacitor/android": "^5.7.4",
"@capacitor/core": "^5.7.4",
"@capacitor/docgen": "^0.2.2",
"@capacitor/ios": "^5.7.4",
"@ionic/eslint-config": "^0.3.0",
"@ionic/prettier-config": "^3.0.0",
"@ionic/prettier-config": "^4.0.0",
"@ionic/swiftlint-config": "^1.1.2",
"del-cli": "^5.0.0",
"del-cli": "^5.1.0",
"rollup": "^2.78.0",
"typescript": "~5.1.3"
},
Expand Down

0 comments on commit 771f3f3

Please sign in to comment.