Skip to content

Commit 012a615

Browse files
suriksarkisyansuriksarkisyan
authored
Merge branch 'main' into release/6.0.0
2 parents c5e29b5 + 991e00c commit 012a615

File tree

21 files changed

+9
-366
lines changed

21 files changed

+9
-366
lines changed

‎.github/workflows/publish.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ jobs:
1515
- name: Setup Flutter
1616
uses: subosito/flutter-action@v2
1717
with:
18+
flutter-version: '3.7.7'
1819
channel: 'stable'
1920

2021
- name: Flutter version

‎android/build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,6 @@ android {
4343

4444
dependencies {
4545
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
46-
implementation "io.qonversion.sandwich:sandwich:2.0.0"
46+
implementation "io.qonversion.sandwich:sandwich:1.5.2"
4747
implementation 'com.google.code.gson:gson:2.9.0'
4848
}

‎android/src/main/kotlin/com/qonversion/flutter/sdk/qonversion_flutter_sdk/QonversionPlugin.kt‎

Lines changed: 0 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -106,9 +106,6 @@ class QonversionPlugin : MethodCallHandler, FlutterPlugin, ActivityAware {
106106
"offerings" -> {
107107
return offerings(result)
108108
}
109-
"remoteConfig" -> {
110-
return remoteConfig(result)
111-
}
112109
"logout" -> {
113110
qonversionSandwich.logout()
114111
return result.success(null)
@@ -133,8 +130,6 @@ class QonversionPlugin : MethodCallHandler, FlutterPlugin, ActivityAware {
133130
"setCustomUserProperty" -> setCustomUserProperty(args, result)
134131
"addAttributionData" -> addAttributionData(args, result)
135132
"checkTrialIntroEligibility" -> checkTrialIntroEligibility(args, result)
136-
"attachUserToExperiment" -> attachUserToExperiment(args, result)
137-
"detachUserFromExperiment" -> detachUserFromExperiment(args, result)
138133
"storeSdkInfo" -> storeSdkInfo(args, result)
139134
"identify" -> identify(args["userId"] as? String, result)
140135
"automationsSetNotificationsToken" -> automationsPlugin.setNotificationsToken(args["notificationsToken"] as? String, result)
@@ -222,10 +217,6 @@ class QonversionPlugin : MethodCallHandler, FlutterPlugin, ActivityAware {
222217
qonversionSandwich.offerings(result.toJsonResultListener())
223218
}
224219

225-
private fun remoteConfig(result: Result) {
226-
qonversionSandwich.remoteConfig(result.toJsonResultListener())
227-
}
228-
229220
private fun products(result: Result) {
230221
qonversionSandwich.products(result.toResultListener())
231222
}
@@ -272,21 +263,6 @@ class QonversionPlugin : MethodCallHandler, FlutterPlugin, ActivityAware {
272263
qonversionSandwich.checkTrialIntroEligibility(ids, result.toJsonResultListener())
273264
}
274265

275-
private fun attachUserToExperiment(args: Map<String, Any>, result: Result) {
276-
@Suppress("UNCHECKED_CAST")
277-
val experimentId = args["experimentId"] as? String ?: return result.noNecessaryDataError()
278-
val groupId = args["groupId"] as? String ?: return result.noNecessaryDataError()
279-
280-
qonversionSandwich.attachUserToExperiment(experimentId, groupId, result.toJsonResultListener())
281-
}
282-
283-
private fun detachUserFromExperiment(args: Map<String, Any>, result: Result) {
284-
@Suppress("UNCHECKED_CAST")
285-
val experimentId = args["experimentId"] as? String ?: return result.noNecessaryDataError()
286-
287-
qonversionSandwich.detachUserFromExperiment(experimentId, result.toJsonResultListener())
288-
}
289-
290266
private fun userInfo(result: Result) {
291267
qonversionSandwich.userInfo(result.toResultListener())
292268
}

‎example/ios/Runner.xcodeproj/project.pbxproj‎

Lines changed: 0 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,6 @@
1010
1498D2341E8E89220040F4C2 /* GeneratedPluginRegistrant.m in Sources */ = {isa = PBXBuildFile; fileRef = 1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */; };
1111
3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */ = {isa = PBXBuildFile; fileRef = 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */; };
1212
4CB27CA1276762D900DE51FD /* GoogleService-Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = 4CB27CA0276762D900DE51FD /* GoogleService-Info.plist */; };
13-
70A6004A2A4DE85F00B4378E /* QonversionPlugin.m in Sources */ = {isa = PBXBuildFile; fileRef = 70A600432A4DE85F00B4378E /* QonversionPlugin.m */; };
14-
70A6004B2A4DE85F00B4378E /* Extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 70A600442A4DE85F00B4378E /* Extensions.swift */; };
15-
70A6004C2A4DE85F00B4378E /* SwiftQonversionPlugin.swift in Sources */ = {isa = PBXBuildFile; fileRef = 70A600462A4DE85F00B4378E /* SwiftQonversionPlugin.swift */; };
16-
70A6004D2A4DE85F00B4378E /* BaseListenerWrapper.swift in Sources */ = {isa = PBXBuildFile; fileRef = 70A600472A4DE85F00B4378E /* BaseListenerWrapper.swift */; };
17-
70A6004E2A4DE85F00B4378E /* BaseEventStreamHandler.swift in Sources */ = {isa = PBXBuildFile; fileRef = 70A600482A4DE85F00B4378E /* BaseEventStreamHandler.swift */; };
18-
70A6004F2A4DE85F00B4378E /* FlutterError+Custom.swift in Sources */ = {isa = PBXBuildFile; fileRef = 70A600492A4DE85F00B4378E /* FlutterError+Custom.swift */; };
1913
74858FAF1ED2DC5600515810 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 74858FAE1ED2DC5600515810 /* AppDelegate.swift */; };
2014
8876821AD52624FFC742CB13 /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B61BD248B3C1CEFD8465871F /* Pods_Runner.framework */; };
2115
97C146FC1CF9000F007C117D /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FA1CF9000F007C117D /* Main.storyboard */; };
@@ -43,13 +37,6 @@
4337
3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = AppFrameworkInfo.plist; path = Flutter/AppFrameworkInfo.plist; sourceTree = "<group>"; };
4438
4CB27CA0276762D900DE51FD /* GoogleService-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "GoogleService-Info.plist"; sourceTree = "<group>"; };
4539
6A76C3422936312F0071A79A /* Runner.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = Runner.entitlements; sourceTree = "<group>"; };
46-
70A600432A4DE85F00B4378E /* QonversionPlugin.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = QonversionPlugin.m; sourceTree = "<group>"; };
47-
70A600442A4DE85F00B4378E /* Extensions.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Extensions.swift; sourceTree = "<group>"; };
48-
70A600452A4DE85F00B4378E /* QonversionPlugin.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = QonversionPlugin.h; sourceTree = "<group>"; };
49-
70A600462A4DE85F00B4378E /* SwiftQonversionPlugin.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SwiftQonversionPlugin.swift; sourceTree = "<group>"; };
50-
70A600472A4DE85F00B4378E /* BaseListenerWrapper.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = BaseListenerWrapper.swift; sourceTree = "<group>"; };
51-
70A600482A4DE85F00B4378E /* BaseEventStreamHandler.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = BaseEventStreamHandler.swift; sourceTree = "<group>"; };
52-
70A600492A4DE85F00B4378E /* FlutterError+Custom.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "FlutterError+Custom.swift"; sourceTree = "<group>"; };
5340
74858FAD1ED2DC5600515810 /* Runner-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "Runner-Bridging-Header.h"; sourceTree = "<group>"; };
5441
74858FAE1ED2DC5600515810 /* AppDelegate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
5542
7AFA3C8E1D35360C0083082E /* Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = Release.xcconfig; path = Flutter/Release.xcconfig; sourceTree = "<group>"; };
@@ -85,21 +72,6 @@
8572
name = Frameworks;
8673
sourceTree = "<group>";
8774
};
88-
70A600422A4DE85F00B4378E /* Classes */ = {
89-
isa = PBXGroup;
90-
children = (
91-
70A600432A4DE85F00B4378E /* QonversionPlugin.m */,
92-
70A600442A4DE85F00B4378E /* Extensions.swift */,
93-
70A600452A4DE85F00B4378E /* QonversionPlugin.h */,
94-
70A600462A4DE85F00B4378E /* SwiftQonversionPlugin.swift */,
95-
70A600472A4DE85F00B4378E /* BaseListenerWrapper.swift */,
96-
70A600482A4DE85F00B4378E /* BaseEventStreamHandler.swift */,
97-
70A600492A4DE85F00B4378E /* FlutterError+Custom.swift */,
98-
);
99-
name = Classes;
100-
path = ../../macos/Classes;
101-
sourceTree = "<group>";
102-
};
10375
9740EEB11CF90186004384FC /* Flutter */ = {
10476
isa = PBXGroup;
10577
children = (
@@ -114,17 +86,14 @@
11486
97C146E51CF9000F007C117D = {
11587
isa = PBXGroup;
11688
children = (
117-
70A600422A4DE85F00B4378E /* Classes */,
11889
4CB27CA0276762D900DE51FD /* GoogleService-Info.plist */,
11990
9740EEB11CF90186004384FC /* Flutter */,
12091
97C146F01CF9000F007C117D /* Runner */,
12192
97C146EF1CF9000F007C117D /* Products */,
12293
BA1CD22BB5800E684769C062 /* Pods */,
12394
59AF16F90FB67258EC083A19 /* Frameworks */,
12495
);
125-
indentWidth = 2;
12696
sourceTree = "<group>";
127-
tabWidth = 2;
12897
};
12998
97C146EF1CF9000F007C117D /* Products */ = {
13099
isa = PBXGroup;
@@ -343,14 +312,8 @@
343312
isa = PBXSourcesBuildPhase;
344313
buildActionMask = 2147483647;
345314
files = (
346-
70A6004D2A4DE85F00B4378E /* BaseListenerWrapper.swift in Sources */,
347315
74858FAF1ED2DC5600515810 /* AppDelegate.swift in Sources */,
348-
70A6004F2A4DE85F00B4378E /* FlutterError+Custom.swift in Sources */,
349-
70A6004A2A4DE85F00B4378E /* QonversionPlugin.m in Sources */,
350316
1498D2341E8E89220040F4C2 /* GeneratedPluginRegistrant.m in Sources */,
351-
70A6004B2A4DE85F00B4378E /* Extensions.swift in Sources */,
352-
70A6004C2A4DE85F00B4378E /* SwiftQonversionPlugin.swift in Sources */,
353-
70A6004E2A4DE85F00B4378E /* BaseEventStreamHandler.swift in Sources */,
354317
);
355318
runOnlyForDeploymentPostprocessing = 0;
356319
};

‎ios/Classes/SwiftQonversionPlugin.swift‎

Lines changed: 0 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -57,9 +57,6 @@ public class SwiftQonversionPlugin: NSObject, FlutterPlugin {
5757

5858
case "checkEntitlements":
5959
return checkEntitlements(result)
60-
61-
case "remoteConfig":
62-
return remoteConfig(result)
6360

6461
case "restore":
6562
return restore(result)
@@ -130,12 +127,6 @@ public class SwiftQonversionPlugin: NSObject, FlutterPlugin {
130127
case "identify":
131128
return identify(args["userId"] as? String, result)
132129

133-
case "attachUserToExperiment":
134-
return attachUserToExperiment(args, result)
135-
136-
case "detachUserFromExperiment":
137-
return detachUserFromExperiment(args, result)
138-
139130
case "automationsSetNotificationsToken":
140131
automationsPlugin?.setNotificationsToken(args["notificationsToken"] as? String, result)
141132
return
@@ -222,10 +213,6 @@ public class SwiftQonversionPlugin: NSObject, FlutterPlugin {
222213
private func checkEntitlements(_ result: @escaping FlutterResult) {
223214
qonversionSandwich?.checkEntitlements(getDefaultCompletion(result))
224215
}
225-
226-
private func remoteConfig(_ result: @escaping FlutterResult) {
227-
qonversionSandwich?.remoteConfig(getJsonCompletion(result))
228-
}
229216

230217
private func restore(_ result: @escaping FlutterResult) {
231218
qonversionSandwich?.restore(getDefaultCompletion(result))
@@ -268,23 +255,6 @@ public class SwiftQonversionPlugin: NSObject, FlutterPlugin {
268255

269256
qonversionSandwich?.checkTrialIntroEligibility(ids, completion: getJsonCompletion(result))
270257
}
271-
272-
private func attachUserToExperiment(_ args: [String: Any], _ result: @escaping FlutterResult) {
273-
guard let experimentId = args["experimentId"] as? String,
274-
let groupId = args["groupId"] as? String else {
275-
return result(FlutterError.noNecessaryData)
276-
}
277-
278-
qonversionSandwich?.attachUserToExperiment(with: experimentId, groupId: groupId, completion: getJsonCompletion(result))
279-
}
280-
281-
private func detachUserFromExperiment(_ args: [String: Any], _ result: @escaping FlutterResult) {
282-
guard let experimentId = args["experimentId"] as? String else {
283-
return result(FlutterError.noNecessaryData)
284-
}
285-
286-
qonversionSandwich?.detachUserFromExperiment(with: experimentId, completion: getJsonCompletion(result))
287-
}
288258

289259
private func storeSdkInfo(_ args: [String: Any], _ result: @escaping FlutterResult) {
290260
guard let version = args["version"] as? String,

‎ios/qonversion_flutter.podspec‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ Pod::Spec.new do |s|
1616
s.source_files = 'Classes/**/*'
1717
s.dependency 'Flutter'
1818
s.platform = :ios, '9.0'
19-
s.dependency "QonversionSandwich", "2.0.0"
19+
s.dependency "QonversionSandwich", "1.5.2"
2020

2121
# Flutter.framework does not contain a i386 slice. Only x86_64 simulators are supported.
2222
s.pod_target_xcconfig = { 'DEFINES_MODULE' => 'YES', 'VALID_ARCHS[sdk=iphonesimulator*]' => 'x86_64' }

‎lib/qonversion_flutter.dart‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ export 'src/dto/product_type.dart';
1818
export 'src/dto/proration_mode.dart';
1919
export 'src/dto/purchase_exception.dart';
2020
export 'src/dto/qonversion_error.dart';
21-
export 'src/dto/remote_config.dart';
2221
export 'src/dto/screen_presentation_config.dart';
2322
export 'src/dto/screen_presentation_style.dart';
2423
export 'src/dto/user.dart';

‎lib/src/dto/experiment.dart‎

Lines changed: 0 additions & 29 deletions
This file was deleted.

‎lib/src/dto/experiment.g.dart‎

Lines changed: 0 additions & 15 deletions
This file was deleted.

‎lib/src/dto/experiment_group.dart‎

Lines changed: 0 additions & 32 deletions
This file was deleted.

0 commit comments

Comments
 (0)