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.

Sign up for GitHub

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

Prepare 2.3.5 #65

Merged
merged 6 commits into from
Jul 12, 2024
Merged

Prepare 2.3.5 #65

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
2b47bec
Update android and ios native dependencies
Nevazhnovu Jul 11, 2024
ba383e0
Change `language` from enum to string in `configLib`
Nevazhnovu Jul 11, 2024
541c19f
Update `AndroidResolver` and `mainTemplate.gradle`
Nevazhnovu Jul 11, 2024
9baaf22
Update `package.json`
Nevazhnovu Jul 11, 2024
f64c0de
Update `CHANGELOG.md`
Nevazhnovu Jul 11, 2024
9a48410
Update `unitypackage`
Nevazhnovu Jul 11, 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
4 changes: 2 additions & 2 deletions Assets/ConsentManagementProvider/Plugins/iOS/Source/SwiftBridge.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ import UIKit
gdpr: Bool,
ccpa: Bool,
usnat: Bool,
language: SPMessageLanguage,
language: String,
gdprPmId: String,
ccpaPmId: String,
usnatPmId: String) {
Expand All @@ -128,7 +128,7 @@ import UIKit
usnat: usnat ? SPCampaign(targetingParams: usnatTargetingParams, transitionCCPAAuth: config.transitionCCPAAuth, supportLegacyUSPString: config.supportLegacyUSPString) : nil,
ios14: SPCampaign()
),
language: language,
language: SPMessageLanguage.init(rawValue: language) ?? SPMessageLanguage.BrowserDefault,
delegate: self
)}()
}
Expand Down
4 changes: 2 additions & 2 deletions Assets/ConsentManagementProvider/Plugins/iOS/Source/Unity.mm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,9 +81,9 @@ void _setSupportLegacyUSPString(bool value)
[swiftBridge setSupportLegacyUSPStringWithValue:value];
}

void _configLib(int accountId, int propertyId, char* propertyName, bool gdpr, bool ccpa, bool usnat, SPMessageLanguage language, char* gdprPmId, char* ccpaPmId, char* usnatPmId)
void _configLib(int accountId, int propertyId, char* propertyName, bool gdpr, bool ccpa, bool usnat, char* language, char* gdprPmId, char* ccpaPmId, char* usnatPmId)
{
[swiftBridge configLibWithAccountId:accountId propertyId:propertyId propertyName:[NSString stringWithFormat:@"%s", propertyName] gdpr:gdpr ccpa:ccpa usnat:usnat language:language gdprPmId:[NSString stringWithFormat:@"%s", gdprPmId] ccpaPmId:[NSString stringWithFormat:@"%s", ccpaPmId] usnatPmId:[NSString stringWithFormat:@"%s", usnatPmId]];
[swiftBridge configLibWithAccountId:accountId propertyId:propertyId propertyName:[NSString stringWithFormat:@"%s", propertyName] gdpr:gdpr ccpa:ccpa usnat:usnat language:[NSString stringWithFormat:@"%s", language] gdprPmId:[NSString stringWithFormat:@"%s", gdprPmId] ccpaPmId:[NSString stringWithFormat:@"%s", ccpaPmId] usnatPmId:[NSString stringWithFormat:@"%s", usnatPmId]];
}

void _loadMessage()
Expand Down
7 changes: 5 additions & 2 deletions Assets/ConsentManagementProvider/Scripts/wrapper/iOS/ConsentWrapperIOS.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
using System;
using System.Collections.Generic;
using ConsentManagementProviderLib.Enum;
#if UNITY_IOS && !UNITY_EDITOR_OSX
using System.Runtime.InteropServices;
#endif
Expand Down Expand Up @@ -37,7 +38,7 @@ private set
[DllImport("__Internal")]
private static extern void _setSupportLegacyUSPString(bool value);
[DllImport("__Internal")]
private static extern void _configLib(int accountId, int propertyId, string propertyName, bool gdpr, bool ccpa, bool usnat, MESSAGE_LANGUAGE language, string gdprPmId, string ccpaPmId, string usnatPmId);
private static extern void _configLib(int accountId, int propertyId, string propertyName, bool gdpr, bool ccpa, bool usnat, string language, string gdprPmId, string ccpaPmId, string usnatPmId);
[DllImport("__Internal")]
private static extern void _loadMessage();
[DllImport("__Internal")]
Expand Down Expand Up @@ -121,7 +122,9 @@ public void InitializeLib(
_setTransitionCCPAAuth((bool)transitionCCPAAuth);
if(supportLegacyUSPString != null)
_setSupportLegacyUSPString((bool)supportLegacyUSPString);
_configLib(accountId, propertyId, propertyName, gdpr, ccpa, usnat, language, gdprPmId, ccpaPmId, usnatPmId);

string langName = CSharp2JavaStringEnumMapper.GetMessageLanguageKey(language);
_configLib(accountId, propertyId, propertyName, gdpr, ccpa, usnat, langName, gdprPmId, ccpaPmId, usnatPmId);
#endif
}

Expand Down
4 changes: 2 additions & 2 deletions Assets/ExternalDependencyManager/Editor/SourcepointDependencies.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,14 +31,14 @@
* "subspecs" (optional)
Subspecs to include for the pod.
-->
<iosPod name="ConsentViewController" version="7.6.8" bitcodeEnabled="true"
<iosPod name="ConsentViewController" version="7.6.10" bitcodeEnabled="true"
minTargetSdk="10.0" addToAllTargets="true">

</iosPod>
</iosPods>

<androidPackages>
<!-- <androidPackage spec="org.jetbrains.kotlinx:kotlinx-serialization-json-jvm:1.3.0" />-->
<androidPackage spec="com.sourcepoint.cmplibrary:cmplibrary:7.8.4" />
<androidPackage spec="com.sourcepoint.cmplibrary:cmplibrary:7.8.5" />
</androidPackages>
</dependencies>
2 changes: 1 addition & 1 deletion Assets/Plugins/Android/mainTemplate.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ apply plugin: 'com.android.library'
dependencies {
implementation fileTree(dir: 'libs', include: ['*.jar'])
// Android Resolver Dependencies Start
implementation 'com.sourcepoint.cmplibrary:cmplibrary:7.8.4' // Assets/ExternalDependencyManager/Editor/SourcepointDependencies.xml:42
implementation 'com.sourcepoint.cmplibrary:cmplibrary:7.8.5' // Assets/ExternalDependencyManager/Editor/SourcepointDependencies.xml:42
// Android Resolver Dependencies End
**DEPS**}

Expand Down
3 changes: 3 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
# 2.3.5
* Unity SDK brought to v7.8.5 Android & v7.6.10 iOS native SDK [#65](https://github.com/SourcePointUSA/unity-sdk/pull/65)

# 2.3.4
* Unity SDK brought up to v7.8.4 of Native Android SDK [#62](https://github.com/SourcePointUSA/unity-sdk/pull/62) which fixes the following:
* [DIA-4112](https://sourcepoint.atlassian.net/browse/DIA-4112) Fixed: Links to vendors' privacy policy pages now working on Android devices
Expand Down
2 changes: 1 addition & 1 deletion ProjectSettings/AndroidResolverDependencies.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<dependencies>
<packages>
<package>com.sourcepoint.cmplibrary:cmplibrary:7.8.4</package>
<package>com.sourcepoint.cmplibrary:cmplibrary:7.8.5</package>
</packages>
<files />
<settings>
Expand Down
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "com.sourcepoint.unitycmp",
"displayName": "Sourcepoint Consent Message Plugin",
"version": "2.3.4",
"version": "2.3.5",
"unity": "2021.3",
"description": "Native UI Privacy Manager for both GDPR and CCPA legislations.",
"author": {
Expand Down
Binary file modified unitypackage/ConsentManagementProvider.unitypackage
View file
Open in desktop
Binary file not shown.