Skip to content

Commit

Permalink
Update dependency scripts (#4)
Browse files Browse the repository at this point in the history
* fix script used to get latest Didomi SDK

* update workflows actions

* update Didomi SDK dependency

* update project

---------

Co-authored-by: Automatic update <tech@didomi.io>
  • Loading branch information
nicolas-chaix-didomi and Automatic update authored Sep 4, 2024
1 parent f2aeb7e commit f3c17a6
Show file tree
Hide file tree
Showing 5 changed files with 51 additions and 71 deletions.
28 changes: 21 additions & 7 deletions .github/scripts/query_last_ios_sdk_version.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,29 @@
# Get iOS SDK last version (latest from cocoapods)
#----------------------------------------------------------

lastVersion=""
for line in $(pod trunk info Didomi-XCFramework); do
if [[ "$line" =~ ^[0-9]+\.[0-9]+\.[0-9]+$ ]]; then
lastVersion=$line
fi
done
# Get last version from pod
pod_last_version() {
version=""
temp_file=$(mktemp)
pod trunk info Didomi-XCFramework > "$temp_file"

while IFS= read -r line; do
if [[ "$line" =~ ^[[:space:]]*-[[:space:]]*([0-9]+\.[0-9]+\.[0-9]+) ]]; then
current_version="${BASH_REMATCH[1]}"
if [[ -z "$version" || $(printf '%s\n' "$version" "$current_version" | sort -V | tail -n1) == "$current_version" ]]; then
version=$current_version
fi
fi
done < "$temp_file"

rm "$temp_file"
echo "$version"
}

lastVersion=$(pod_last_version)

if [[ ! $lastVersion =~ ^[0-9]+.[0-9]+.[0-9]+$ ]]; then
echo "Error while getting last iOS version"
echo "Error while getting last iOS version ($lastVersion)"
exit 1
fi

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/scheduled-update.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
continue: ${{ steps.check.outputs.continue }}
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Check Didomi SDK version
id: check
Expand All @@ -32,7 +32,7 @@ jobs:
runs-on: macos-latest
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
token: ${{ secrets.CUSTOM_GITHUB_TOKEN }}
persist-credentials: false # otherwise, the token used is the GITHUB_TOKEN, instead of your personal token
Expand Down
2 changes: 1 addition & 1 deletion Podfile
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@ target 'Sample App Swift' do
use_frameworks!

# Pods for Sample App Swift
pod 'Didomi-XCFramework', '1.95.2'
pod 'Didomi-XCFramework', '2.11.1'
pod 'Google-Mobile-Ads-SDK'
end
70 changes: 9 additions & 61 deletions Podfile.lock
Original file line number Diff line number Diff line change
@@ -1,76 +1,24 @@
PODS:
- Didomi-XCFramework (1.95.2)
- Google-Mobile-Ads-SDK (10.14.0):
- GoogleAppMeasurement (< 11.0, >= 7.0)
- Didomi-XCFramework (2.11.1)
- Google-Mobile-Ads-SDK (11.8.0):
- GoogleUserMessagingPlatform (>= 1.1)
- GoogleAppMeasurement (10.18.0):
- GoogleAppMeasurement/AdIdSupport (= 10.18.0)
- GoogleUtilities/AppDelegateSwizzler (~> 7.11)
- GoogleUtilities/MethodSwizzler (~> 7.11)
- GoogleUtilities/Network (~> 7.11)
- "GoogleUtilities/NSData+zlib (~> 7.11)"
- nanopb (< 2.30910.0, >= 2.30908.0)
- GoogleAppMeasurement/AdIdSupport (10.18.0):
- GoogleAppMeasurement/WithoutAdIdSupport (= 10.18.0)
- GoogleUtilities/AppDelegateSwizzler (~> 7.11)
- GoogleUtilities/MethodSwizzler (~> 7.11)
- GoogleUtilities/Network (~> 7.11)
- "GoogleUtilities/NSData+zlib (~> 7.11)"
- nanopb (< 2.30910.0, >= 2.30908.0)
- GoogleAppMeasurement/WithoutAdIdSupport (10.18.0):
- GoogleUtilities/AppDelegateSwizzler (~> 7.11)
- GoogleUtilities/MethodSwizzler (~> 7.11)
- GoogleUtilities/Network (~> 7.11)
- "GoogleUtilities/NSData+zlib (~> 7.11)"
- nanopb (< 2.30910.0, >= 2.30908.0)
- GoogleUserMessagingPlatform (2.1.0)
- GoogleUtilities/AppDelegateSwizzler (7.12.0):
- GoogleUtilities/Environment
- GoogleUtilities/Logger
- GoogleUtilities/Network
- GoogleUtilities/Environment (7.12.0):
- PromisesObjC (< 3.0, >= 1.2)
- GoogleUtilities/Logger (7.12.0):
- GoogleUtilities/Environment
- GoogleUtilities/MethodSwizzler (7.12.0):
- GoogleUtilities/Logger
- GoogleUtilities/Network (7.12.0):
- GoogleUtilities/Logger
- "GoogleUtilities/NSData+zlib"
- GoogleUtilities/Reachability
- "GoogleUtilities/NSData+zlib (7.12.0)"
- GoogleUtilities/Reachability (7.12.0):
- GoogleUtilities/Logger
- nanopb (2.30909.1):
- nanopb/decode (= 2.30909.1)
- nanopb/encode (= 2.30909.1)
- nanopb/decode (2.30909.1)
- nanopb/encode (2.30909.1)
- PromisesObjC (2.3.1)
- GoogleUserMessagingPlatform (2.5.0)

DEPENDENCIES:
- Didomi-XCFramework (= 1.95.2)
- Didomi-XCFramework (= 2.11.1)
- Google-Mobile-Ads-SDK

SPEC REPOS:
trunk:
- Didomi-XCFramework
- Google-Mobile-Ads-SDK
- GoogleAppMeasurement
- GoogleUserMessagingPlatform
- GoogleUtilities
- nanopb
- PromisesObjC

SPEC CHECKSUMS:
Didomi-XCFramework: 6bf68d6f8c9162bb28cf19b1a56b1dfceb657b42
Google-Mobile-Ads-SDK: 8f67a72f88d057335b1ac3f501e2b68ad054116e
GoogleAppMeasurement: 70ce9aa438cff1cfb31ea3e660bcc67734cb716e
GoogleUserMessagingPlatform: dce302b8f1b84d6e945812ee7a15c3f65a102cbf
GoogleUtilities: 0759d1a57ebb953965c2dfe0ba4c82e95ccc2e34
nanopb: d4d75c12cd1316f4a64e3c6963f879ecd4b5e0d5
PromisesObjC: c50d2056b5253dadbd6c2bea79b0674bd5a52fa4
Didomi-XCFramework: 02c1454326e1968decb0c404db8a2666b10cad8f
Google-Mobile-Ads-SDK: c1c53687b572122c5b0bdaf354335bbf40fd81ef
GoogleUserMessagingPlatform: 6b4f48a370e77ce121d034c908cc6ee4fdafaf13

PODFILE CHECKSUM: 72fb013ef4e1845b0c95a7bb599ab3badc843e9e
PODFILE CHECKSUM: fa07efca9a21ef90354bce9347cc4bc9928df9a8

COCOAPODS: 1.13.0
COCOAPODS: 1.15.2
18 changes: 18 additions & 0 deletions Sample App Swift.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -125,6 +125,7 @@
CD06DB5F27E3308F002DDCA3 /* Frameworks */,
CD06DB6027E3308F002DDCA3 /* Resources */,
139BEE014B5B63BD0F1441E4 /* [CP] Embed Pods Frameworks */,
AAED6EF244F4036C666B1CDA /* [CP] Copy Pods Resources */,
);
buildRules = (
);
Expand Down Expand Up @@ -223,6 +224,23 @@
shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
showEnvVarsInLog = 0;
};
AAED6EF244F4036C666B1CDA /* [CP] Copy Pods Resources */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputFileListPaths = (
"${PODS_ROOT}/Target Support Files/Pods-Sample App Swift/Pods-Sample App Swift-resources-${CONFIGURATION}-input-files.xcfilelist",
);
name = "[CP] Copy Pods Resources";
outputFileListPaths = (
"${PODS_ROOT}/Target Support Files/Pods-Sample App Swift/Pods-Sample App Swift-resources-${CONFIGURATION}-output-files.xcfilelist",
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Sample App Swift/Pods-Sample App Swift-resources.sh\"\n";
showEnvVarsInLog = 0;
};
/* End PBXShellScriptBuildPhase section */

/* Begin PBXSourcesBuildPhase section */
Expand Down

0 comments on commit f3c17a6

Please sign in to comment.