Skip to content

Commit

Permalink
chore: solve npm security warnings, remove old pieces of maplibre
Browse files Browse the repository at this point in the history
  • Loading branch information
QcFe committed Feb 12, 2025
1 parent 3663672 commit 1562bd3
Show file tree
Hide file tree
Showing 10 changed files with 551 additions and 724 deletions.
5 changes: 2 additions & 3 deletions .github/workflows/build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ jobs:
echo "CONFIGURED:"
cat $GITHUB_OUTPUT
- name: Set up Node.js
- name: Setup Node.js
uses: actions/setup-node@v4
with:
node-version-file: .nvmrc
Expand Down Expand Up @@ -166,7 +166,7 @@ jobs:
uses: ruby/setup-ruby@v1
with:
bundler-cache: true # runs 'bundle install' and caches installed gems automatically
- name: Set up Node.js
- name: Setup Node.js
uses: actions/setup-node@v4
with:
node-version-file: .nvmrc
Expand Down Expand Up @@ -234,7 +234,6 @@ jobs:
FASTLANE_PASSWORD: ${{ secrets.FASTLANE_POLI_MOBILE_PW }}
FASTLANE_APPLE_APPLICATION_SPECIFIC_PASSWORD: ${{ secrets.FASTLANE_APPLE_DEV_PW }}
SUPPLY_GOOGLE_SERVICE_INFO_PLIST_PATH: "./GoogleService-Info.plist"
CCACHE_COMPILERCHECK: content
needs: configure
runs-on: [macos-latest]
steps:
Expand Down
4 changes: 4 additions & 0 deletions .github/workflows/checks.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,10 @@ jobs:
uses: actions/checkout@v4
with:
fetch-depth: 0
- name: Setup Node.js
uses: actions/setup-node@v4
with:
node-version-file: .nvmrc
- name: Cache node modules
uses: actions/cache@v4
with:
Expand Down
80 changes: 40 additions & 40 deletions ios/Podfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -2,49 +2,49 @@ PODS:
- boost (1.84.0)
- DoubleConversion (1.1.6)
- FBLazyVector (0.76.1)
- Firebase (11.4.0):
- Firebase/Core (= 11.4.0)
- Firebase/Core (11.4.0):
- Firebase (11.8.0):
- Firebase/Core (= 11.8.0)
- Firebase/Core (11.8.0):
- Firebase/CoreOnly
- FirebaseAnalytics (~> 11.4.0)
- Firebase/CoreOnly (11.4.0):
- FirebaseCore (= 11.4.0)
- Firebase/Messaging (11.4.0):
- FirebaseAnalytics (~> 11.8.0)
- Firebase/CoreOnly (11.8.0):
- FirebaseCore (~> 11.8.0)
- Firebase/Messaging (11.8.0):
- Firebase/CoreOnly
- FirebaseMessaging (~> 11.4.0)
- FirebaseAnalytics (11.4.0):
- FirebaseAnalytics/AdIdSupport (= 11.4.0)
- FirebaseCore (~> 11.0)
- FirebaseMessaging (~> 11.8.0)
- FirebaseAnalytics (11.8.0):
- FirebaseAnalytics/AdIdSupport (= 11.8.0)
- FirebaseCore (~> 11.8.0)
- FirebaseInstallations (~> 11.0)
- GoogleUtilities/AppDelegateSwizzler (~> 8.0)
- GoogleUtilities/MethodSwizzler (~> 8.0)
- GoogleUtilities/Network (~> 8.0)
- "GoogleUtilities/NSData+zlib (~> 8.0)"
- nanopb (~> 3.30910.0)
- FirebaseAnalytics/AdIdSupport (11.4.0):
- FirebaseCore (~> 11.0)
- FirebaseAnalytics/AdIdSupport (11.8.0):
- FirebaseCore (~> 11.8.0)
- FirebaseInstallations (~> 11.0)
- GoogleAppMeasurement (= 11.4.0)
- GoogleAppMeasurement (= 11.8.0)
- GoogleUtilities/AppDelegateSwizzler (~> 8.0)
- GoogleUtilities/MethodSwizzler (~> 8.0)
- GoogleUtilities/Network (~> 8.0)
- "GoogleUtilities/NSData+zlib (~> 8.0)"
- nanopb (~> 3.30910.0)
- FirebaseCore (11.4.0):
- FirebaseCoreInternal (~> 11.0)
- FirebaseCore (11.8.1):
- FirebaseCoreInternal (~> 11.8.0)
- GoogleUtilities/Environment (~> 8.0)
- GoogleUtilities/Logger (~> 8.0)
- FirebaseCoreExtension (11.4.0):
- FirebaseCore (~> 11.0)
- FirebaseCoreInternal (11.4.2):
- FirebaseCoreInternal (11.8.0):
- "GoogleUtilities/NSData+zlib (~> 8.0)"
- FirebaseInstallations (11.4.0):
- FirebaseCore (~> 11.0)
- FirebaseInstallations (11.8.0):
- FirebaseCore (~> 11.8.0)
- GoogleUtilities/Environment (~> 8.0)
- GoogleUtilities/UserDefaults (~> 8.0)
- PromisesObjC (~> 2.4)
- FirebaseMessaging (11.4.0):
- FirebaseCore (~> 11.0)
- FirebaseMessaging (11.8.0):
- FirebaseCore (~> 11.8.0)
- FirebaseInstallations (~> 11.0)
- GoogleDataTransport (~> 10.0)
- GoogleUtilities/AppDelegateSwizzler (~> 8.0)
Expand All @@ -54,21 +54,21 @@ PODS:
- nanopb (~> 3.30910.0)
- fmt (9.1.0)
- glog (0.3.5)
- GoogleAppMeasurement (11.4.0):
- GoogleAppMeasurement/AdIdSupport (= 11.4.0)
- GoogleAppMeasurement (11.8.0):
- GoogleAppMeasurement/AdIdSupport (= 11.8.0)
- GoogleUtilities/AppDelegateSwizzler (~> 8.0)
- GoogleUtilities/MethodSwizzler (~> 8.0)
- GoogleUtilities/Network (~> 8.0)
- "GoogleUtilities/NSData+zlib (~> 8.0)"
- nanopb (~> 3.30910.0)
- GoogleAppMeasurement/AdIdSupport (11.4.0):
- GoogleAppMeasurement/WithoutAdIdSupport (= 11.4.0)
- GoogleAppMeasurement/AdIdSupport (11.8.0):
- GoogleAppMeasurement/WithoutAdIdSupport (= 11.8.0)
- GoogleUtilities/AppDelegateSwizzler (~> 8.0)
- GoogleUtilities/MethodSwizzler (~> 8.0)
- GoogleUtilities/Network (~> 8.0)
- "GoogleUtilities/NSData+zlib (~> 8.0)"
- nanopb (~> 3.30910.0)
- GoogleAppMeasurement/WithoutAdIdSupport (11.4.0):
- GoogleAppMeasurement/WithoutAdIdSupport (11.8.0):
- GoogleUtilities/AppDelegateSwizzler (~> 8.0)
- GoogleUtilities/MethodSwizzler (~> 8.0)
- GoogleUtilities/Network (~> 8.0)
Expand Down Expand Up @@ -2007,12 +2007,12 @@ PODS:
- React-Core
- SDWebImage (~> 5.11.1)
- SDWebImageWebPCoder (~> 0.8.4)
- RNFBApp (21.2.0):
- Firebase/CoreOnly (<= 11.4.0)
- RNFBApp (21.10.0):
- Firebase/CoreOnly (= 11.8.0)
- React-Core
- RNFBMessaging (21.2.0):
- Firebase/Messaging (<= 11.4.0)
- FirebaseCoreExtension (<= 11.4.0)
- RNFBMessaging (21.10.0):
- Firebase/Messaging (= 11.8.0)
- FirebaseCoreExtension
- React-Core
- RNFBApp
- RNFileViewer (2.1.5):
Expand Down Expand Up @@ -2654,16 +2654,16 @@ SPEC CHECKSUMS:
boost: 1dca942403ed9342f98334bf4c3621f011aa7946
DoubleConversion: f16ae600a246532c4020132d54af21d0ddb2a385
FBLazyVector: 7075bb12898bc3998fd60f4b7ca422496cc2cdf7
Firebase: cf1b19f21410b029b6786a54e9764a0cacad3c99
FirebaseAnalytics: 3feef9ae8733c567866342a1000691baaa7cad49
FirebaseCore: e0510f1523bc0eb21653cac00792e1e2bd6f1771
Firebase: d80354ed7f6df5f9aca55e9eb47cc4b634735eaf
FirebaseAnalytics: 4fd42def128146e24e480e89f310e3d8534ea42b
FirebaseCore: 99fe0c4b44a39f37d99e6404e02009d2db5d718d
FirebaseCoreExtension: 4445e4cd877e0790c4af33bedca61eaef27b7513
FirebaseCoreInternal: 35731192cab10797b88411be84940d2beb33a238
FirebaseInstallations: 6ef4a1c7eb2a61ee1f74727d7f6ce2e72acf1414
FirebaseMessaging: f8a160d99c2c2e5babbbcc90c4a3e15db036aee2
FirebaseCoreInternal: df24ce5af28864660ecbd13596fc8dd3a8c34629
FirebaseInstallations: 6c963bd2a86aca0481eef4f48f5a4df783ae5917
FirebaseMessaging: 487b634ccdf6f7b7ff180fdcb2a9935490f764e8
fmt: 10c6e61f4be25dc963c36bd73fc7b1705fe975be
glog: 08b301085f15bcbb6ff8632a8ebaf239aae04e6a
GoogleAppMeasurement: 987769c4ca6b968f2479fbcc9fe3ce34af454b8e
GoogleAppMeasurement: fc0817122bd4d4189164f85374e06773b9561896
GoogleDataTransport: aae35b7ea0c09004c3797d53c8c41f66f219d6a7
GoogleUtilities: 26a3abef001b6533cf678d3eb38fd3f614b7872d
hermes-engine: 46f1ffbf0297f4298862068dd4c274d4ac17a1fd
Expand Down Expand Up @@ -2748,8 +2748,8 @@ SPEC CHECKSUMS:
RNCClipboard: 65367ee0429c61ea5cb9d819921877730d59b039
RNDeviceInfo: ae26ae45db3f9937f038a284bcd0a1db8d70db96
RNFastImage: 462a183c4b0b6b26fdfd639e1ed6ba37536c3b87
RNFBApp: 598b2df8ff9014bdd6ebc33a531947629196d576
RNFBMessaging: 3323183f2b06939d4abd4dd76299b2b08dae453c
RNFBApp: c0e35c80b0da1c93767dcb0060491735518dbebb
RNFBMessaging: b8d712a6e70f9c4710928749950aeeb595270939
RNFileViewer: 4b5d83358214347e4ab2d4ca8d5c1c90d869e251
RNFS: 89de7d7f4c0f6bafa05343c578f61118c8282ed8
RNGestureHandler: 16ef3dc2d7ecb09f240f25df5255953c4098819b
Expand Down
51 changes: 1 addition & 50 deletions ios/students.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,6 @@
421B0ABE59B5422AA80527B9 /* Montserrat-Regular.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 2B8C6611CD99474EB542989F /* Montserrat-Regular.ttf */; };
4261CE84249426DA2AD8F7D3 /* libPods-students-studentsTests.a in Frameworks */ = {isa = PBXBuildFile; fileRef = BADEE9E139127DB51296F263 /* libPods-students-studentsTests.a */; };
81AB9BB82411601600AC10FF /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 81AB9BB72411601600AC10FF /* LaunchScreen.storyboard */; };
854737302CD8224500A264C2 /* MapLibre in Frameworks */ = {isa = PBXBuildFile; productRef = C9FC690AA1369A0BC5CA9D14 /* MapLibre */; };
854737312CD8224500A264C2 /* MapLibre in Frameworks */ = {isa = PBXBuildFile; productRef = 4F85B788136772BDD767E888 /* MapLibre */; };
854737322CD8224500A264C2 /* MapLibre in Frameworks */ = {isa = PBXBuildFile; productRef = 03F3EA4F2FEF09BB4F99E42A /* MapLibre */; };
944531432DCE469C9F10AB4F /* Montserrat-Bold.ttf in Resources */ = {isa = PBXBuildFile; fileRef = DA6AD6D77E3B40548041A5A2 /* Montserrat-Bold.ttf */; };
96125A232AD6A8E600CF037A /* GoogleService-Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = 96125A222AD6A8E600CF037A /* GoogleService-Info.plist */; };
97547E738A1E444EB344D4D0 /* Montserrat-BoldItalic.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 4D12524BABDE4FD7BA5DBD6E /* Montserrat-BoldItalic.ttf */; };
Expand Down Expand Up @@ -104,7 +101,6 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
854737322CD8224500A264C2 /* MapLibre in Frameworks */,
4261CE84249426DA2AD8F7D3 /* libPods-students-studentsTests.a in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
Expand All @@ -113,7 +109,6 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
854737312CD8224500A264C2 /* MapLibre in Frameworks */,
3EA6CBE673262FFC27683243 /* libPods-students.a in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
Expand All @@ -122,7 +117,6 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
854737302CD8224500A264C2 /* MapLibre in Frameworks */,
CB4BF40DED3EE2D517E92179 /* libPods-students-students dev.a in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
Expand Down Expand Up @@ -261,9 +255,6 @@
00E356F51AD99517003FC87E /* PBXTargetDependency */,
);
name = studentsTests;
packageProductDependencies = (
03F3EA4F2FEF09BB4F99E42A /* MapLibre */,
);
productName = studentsTests;
productReference = 00E356EE1AD99517003FC87E /* studentsTests.xctest */;
productType = "com.apple.product-type.bundle.unit-test";
Expand All @@ -287,9 +278,6 @@
dependencies = (
);
name = students;
packageProductDependencies = (
4F85B788136772BDD767E888 /* MapLibre */,
);
productName = students;
productReference = 13B07F961A680F5B00A75B9A /* students.app */;
productType = "com.apple.product-type.application";
Expand All @@ -312,9 +300,6 @@
dependencies = (
);
name = "students dev";
packageProductDependencies = (
C9FC690AA1369A0BC5CA9D14 /* MapLibre */,
);
productName = students;
productReference = B44D6C2229F17BF2001BA0DC /* students dev.app */;
productType = "com.apple.product-type.application";
Expand All @@ -326,7 +311,7 @@
isa = PBXProject;
attributes = {
BuildIndependentTargetsInParallel = YES;
LastUpgradeCheck = 1520;
LastUpgradeCheck = 1620;
TargetAttributes = {
00E356ED1AD99517003FC87E = {
CreatedOnToolsVersion = 6.2;
Expand All @@ -346,9 +331,6 @@
Base,
);
mainGroup = 83CBB9F61A601CBA00E9B192;
packageReferences = (
19090EAF7B1B274619B15E4A /* XCRemoteSwiftPackageReference "maplibre-gl-native-distribution" */,
);
productRefGroup = 83CBBA001A601CBA00E9B192 /* Products */;
projectDirPath = "";
projectRoot = "";
Expand Down Expand Up @@ -708,7 +690,6 @@
isa = XCBuildConfiguration;
baseConfigurationReference = 357F7B84A61240A55B98C650 /* Pods-students-studentsTests.debug.xcconfig */;
buildSettings = {
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
BUNDLE_LOADER = "$(TEST_HOST)";
GCC_PREPROCESSOR_DEFINITIONS = (
"DEBUG=1",
Expand Down Expand Up @@ -737,7 +718,6 @@
isa = XCBuildConfiguration;
baseConfigurationReference = 7EADBDA19E5649E5022A6C9F /* Pods-students-studentsTests.release.xcconfig */;
buildSettings = {
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
BUNDLE_LOADER = "$(TEST_HOST)";
COPY_PHASE_STRIP = NO;
INFOPLIST_FILE = studentsTests/Info.plist;
Expand Down Expand Up @@ -1116,35 +1096,6 @@
defaultConfigurationName = Release;
};
/* End XCConfigurationList section */

/* Begin XCRemoteSwiftPackageReference section */
19090EAF7B1B274619B15E4A /* XCRemoteSwiftPackageReference "maplibre-gl-native-distribution" */ = {
isa = XCRemoteSwiftPackageReference;
repositoryURL = "https://github.com/maplibre/maplibre-gl-native-distribution";
requirement = {
kind = exactVersion;
version = 6.5.4;
};
};
/* End XCRemoteSwiftPackageReference section */

/* Begin XCSwiftPackageProductDependency section */
03F3EA4F2FEF09BB4F99E42A /* MapLibre */ = {
isa = XCSwiftPackageProductDependency;
package = 19090EAF7B1B274619B15E4A /* XCRemoteSwiftPackageReference "maplibre-gl-native-distribution" */;
productName = MapLibre;
};
4F85B788136772BDD767E888 /* MapLibre */ = {
isa = XCSwiftPackageProductDependency;
package = 19090EAF7B1B274619B15E4A /* XCRemoteSwiftPackageReference "maplibre-gl-native-distribution" */;
productName = MapLibre;
};
C9FC690AA1369A0BC5CA9D14 /* MapLibre */ = {
isa = XCSwiftPackageProductDependency;
package = 19090EAF7B1B274619B15E4A /* XCRemoteSwiftPackageReference "maplibre-gl-native-distribution" */;
productName = MapLibre;
};
/* End XCSwiftPackageProductDependency section */
};
rootObject = 83CBB9F71A601CBA00E9B192 /* Project object */;
}
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1520"
LastUpgradeVersion = "1620"
version = "1.7">
<BuildAction
parallelizeBuildables = "YES"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1520"
LastUpgradeVersion = "1620"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand Down

This file was deleted.

15 changes: 0 additions & 15 deletions ios/students.xcworkspace/xcshareddata/swiftpm/Package.resolved

This file was deleted.

Loading

0 comments on commit 1562bd3

Please sign in to comment.