Merge pull request #11 from adjust/v4181

Version 4.18.1
adjust · Oct 9, 2019 · 396b7c8 · 396b7c8
2 parents ef4e9ed + 904268c
commit 396b7c8
Show file tree

Hide file tree

Showing 35 changed files with 70 additions and 654 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,13 @@
+### Version 4.18.1 (9th October 2019)
+#### Fixed
+- Fixed lack of `getAdid` method implementation in native iOS bridge (thanks to @HenriBeck).
+
+#### Native SDKs
+- [[email protected]][ios_sdk_v4.18.3]
+- [[email protected]][android_sdk_v4.18.3]
+
+---
+
 ### Version 4.18.0 (4th July 2019)
 #### Added
 - Added `trackAdRevenue` method to `Adjust` interface to allow tracking of ad revenue. With this release added support for `MoPub` ad revenue tracking.
@@ -72,6 +82,8 @@
 [ios_sdk_v4.17.0]: https://github.com/adjust/ios_sdk/tree/v4.17.0
 [ios_sdk_v4.17.3]: https://github.com/adjust/ios_sdk/tree/v4.17.3
 [ios_sdk_v4.18.0]: https://github.com/adjust/ios_sdk/tree/v4.18.0
+[ios_sdk_v4.18.3]: https://github.com/adjust/ios_sdk/tree/v4.18.3
 
 [android_sdk_v4.17.0]: https://github.com/adjust/android_sdk/tree/v4.17.0
 [android_sdk_v4.18.0]: https://github.com/adjust/android_sdk/tree/v4.18.0
+[android_sdk_v4.18.3]: https://github.com/adjust/android_sdk/tree/v4.18.3
diff --git a/README.md b/README.md
@@ -86,7 +86,7 @@ You can add Adjust SDK to your Flutter app by adding following to your `pubspec.
 
 ```yaml
 dependencies:
-  adjust_sdk: ^4.18.0
+  adjust_sdk: ^4.18.1
 ```
 
 Then navigate to your project in the terminal and run:

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-4.18.0
+4.18.1
diff --git a/android/build.gradle b/android/build.gradle
@@ -36,5 +36,5 @@ android {
 }
 
 dependencies {
-    implementation 'com.adjust.sdk:adjust-android:4.18.0'
+    implementation 'com.adjust.sdk:adjust-android:4.18.3'
 }
diff --git a/example/ios/Flutter/flutter_export_environment.sh b/example/ios/Flutter/flutter_export_environment.sh
@@ -0,0 +1,8 @@
+#!/bin/sh
+# This is a generated file; do not edit or check into version control.
+export "FLUTTER_ROOT=/Users/uerceg/Development/Flutter/flutter"
+export "FLUTTER_APPLICATION_PATH=/Users/uerceg/Github/flutter_sdk_dev/example"
+export "FLUTTER_TARGET=/Users/uerceg/Github/flutter_sdk_dev/example/lib/main.dart"
+export "FLUTTER_BUILD_DIR=build"
+export "SYMROOT=${SOURCE_ROOT}/../build/ios"
+export "FLUTTER_FRAMEWORK_DIR=/Users/uerceg/Development/Flutter/flutter/bin/cache/artifacts/engine/ios"
diff --git a/example/ios/Podfile.lock b/example/ios/Podfile.lock
@@ -1,9 +1,9 @@
 PODS:
-  - Adjust (4.17.3):
-    - Adjust/Core (= 4.17.3)
-  - Adjust/Core (4.17.3)
-  - adjust_sdk (4.17.1):
-    - Adjust (~> 4.17.3)
+  - Adjust (4.18.3):
+    - Adjust/Core (= 4.18.3)
+  - Adjust/Core (4.18.3)
+  - adjust_sdk (4.18.1):
+    - Adjust (~> 4.18.3)
     - Flutter
   - Flutter (1.0.0)
 
@@ -22,10 +22,10 @@ EXTERNAL SOURCES:
     :path: Pods/.symlinks/flutter/ios
 
 SPEC CHECKSUMS:
-  Adjust: d77428a8e5198af821a059856376b9f16debdcc7
-  adjust_sdk: e4801b30c552aae79a4267d93821e3a73e14640e
-  Flutter: 58dd7d1b27887414a370fcccb9e645c08ffd7a6a
+  Adjust: fef133f0bf610d439953b50306372c68c625d7e9
+  adjust_sdk: 16e632342b0ef7a1b847e2da7779e93fda3a1449
+  Flutter: 0e3d915762c693b495b44d77113d4970485de6ec
 
 PODFILE CHECKSUM: 13dcf421f4da2e937a57e8ba760ed880beae536f
 
-COCOAPODS: 1.7.1
+COCOAPODS: 1.7.4
diff --git a/ios/Classes/AdjustSdk.m b/ios/Classes/AdjustSdk.m
@@ -99,6 +99,8 @@ - (void)handleMethodCall:(FlutterMethodCall *)call result:(FlutterResult)result
     } else if ([@"isEnabled" isEqualToString:call.method]) {
         BOOL isEnabled = [Adjust isEnabled];
         result(@(isEnabled));
+    } else if ([@"getAdid" isEqualToString:call.method]) {
+        result([Adjust adid]);
     } else {
         result(FlutterMethodNotImplemented);
     }

diff --git a/ios/adjust_sdk.podspec b/ios/adjust_sdk.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name                  = 'adjust_sdk'
-  s.version               = '4.18.0'
+  s.version               = '4.18.1'
   s.summary               = 'Adjust Flutter SDK for iOS platform'
   s.description           = <<-DESC
                             Adjust Flutter SDK for iOS platform.
@@ -14,5 +14,5 @@ Pod::Spec.new do |s|
   s.ios.deployment_target = '8.0'
 
   s.dependency 'Flutter'
-  s.dependency 'Adjust', '~> 4.18.0'
+  s.dependency 'Adjust', '~> 4.18.3'
 end
diff --git a/lib/adjust.dart b/lib/adjust.dart
@@ -3,7 +3,7 @@
 //  Adjust SDK
 //
 //  Created by Srdjan Tubin (@2beens) on 25th April 2018.
-//  Copyright (c) 2018 Adjust GmbH. All rights reserved.
+//  Copyright (c) 2018-2019 Adjust GmbH. All rights reserved.
 //
 
 import 'dart:async';
@@ -15,7 +15,7 @@ import 'package:adjust_sdk/adjust_event.dart';
 import 'package:adjust_sdk/adjust_attribution.dart';
 
 class Adjust {
-  static const String _sdkPrefix = 'flutter4.18.0';
+  static const String _sdkPrefix = 'flutter4.18.1';
   static const MethodChannel _channel = const MethodChannel('com.adjust.sdk/api');
 
   static void start(AdjustConfig config) {
@@ -68,6 +68,7 @@ class Adjust {
     return isEnabled;
   }
 
+  // Return value could be `null`
   static Future<String> getAdid() async {
     final String adid = await _channel.invokeMethod('getAdid');
     return adid;

diff --git a/lib/adjust_attribution.dart b/lib/adjust_attribution.dart
@@ -3,7 +3,7 @@
 //  Adjust SDK
 //
 //  Created by Srdjan Tubin (@2beens) on 25th April 2018.
-//  Copyright (c) 2018 Adjust GmbH. All rights reserved.
+//  Copyright (c) 2018-2019 Adjust GmbH. All rights reserved.
 //
 
 class AdjustAttribution {

diff --git a/lib/adjust_config.dart b/lib/adjust_config.dart
@@ -3,7 +3,7 @@
 //  Adjust SDK
 //
 //  Created by Srdjan Tubin (@2beens) on 25th April 2018.
-//  Copyright (c) 2018 Adjust GmbH. All rights reserved.
+//  Copyright (c) 2018-2019 Adjust GmbH. All rights reserved.
 //
 
 import 'package:flutter/services.dart';

diff --git a/lib/adjust_event.dart b/lib/adjust_event.dart
@@ -3,7 +3,7 @@
 //  Adjust SDK
 //
 //  Created by Srdjan Tubin (@2beens) on 25th April 2018.
-//  Copyright (c) 2018 Adjust GmbH. All rights reserved.
+//  Copyright (c) 2018-2019 Adjust GmbH. All rights reserved.
 //
 
 import 'dart:convert';

diff --git a/lib/adjust_event_failure.dart b/lib/adjust_event_failure.dart
@@ -3,7 +3,7 @@
 //  Adjust SDK
 //
 //  Created by Srdjan Tubin (@2beens) on 25th April 2018.
-//  Copyright (c) 2018 Adjust GmbH. All rights reserved.
+//  Copyright (c) 2018-2019 Adjust GmbH. All rights reserved.
 //
 
 class AdjustEventFailure {

diff --git a/lib/adjust_event_success.dart b/lib/adjust_event_success.dart
@@ -3,7 +3,7 @@
 //  Adjust SDK
 //
 //  Created by Srdjan Tubin (@2beens) on 25th April 2018.
-//  Copyright (c) 2018 Adjust GmbH. All rights reserved.
+//  Copyright (c) 2018-2019 Adjust GmbH. All rights reserved.
 //
 
 class AdjustEventSuccess {

diff --git a/lib/adjust_session_failure.dart b/lib/adjust_session_failure.dart
@@ -3,7 +3,7 @@
 //  Adjust SDK
 //
 //  Created by Srdjan Tubin (@2beens) on 25th April 2018.
-//  Copyright (c) 2018 Adjust GmbH. All rights reserved.
+//  Copyright (c) 2018-2019 Adjust GmbH. All rights reserved.
 //
 
 class AdjustSessionFailure {

diff --git a/lib/adjust_session_success.dart b/lib/adjust_session_success.dart
@@ -3,7 +3,7 @@
 //  Adjust SDK
 //
 //  Created by Srdjan Tubin (@2beens) on 25th April 2018.
-//  Copyright (c) 2018 Adjust GmbH. All rights reserved.
+//  Copyright (c) 2018-2019 Adjust GmbH. All rights reserved.
 //
 
 class AdjustSessionSuccess {

diff --git a/pubspec.yaml b/pubspec.yaml
@@ -2,7 +2,7 @@ name: adjust_sdk
 description: This is the Flutter SDK of Adjust™. You can read more about Adjust™ at adjust.com.
 author: Adjust GmbH <[email protected]>
 homepage: https://github.com/adjust/flutter_sdk
-version: 4.18.0
+version: 4.18.1
 
 environment:
     sdk: ">=2.0.0 <3.0.0"

diff --git a/test/android/libs/adjust-test.jar b/test/android/libs/adjust-test.jar
diff --git a/test/app/ios/Flutter/flutter_export_environment.sh b/test/app/ios/Flutter/flutter_export_environment.sh
@@ -0,0 +1,10 @@
+#!/bin/sh
+# This is a generated file; do not edit or check into version control.
+export "FLUTTER_ROOT=/Users/uerceg/Development/Flutter/flutter"
+export "FLUTTER_APPLICATION_PATH=/Users/uerceg/Github/flutter_sdk_dev/test/app"
+export "FLUTTER_TARGET=/Users/uerceg/Github/flutter_sdk_dev/test/app/lib/main.dart"
+export "FLUTTER_BUILD_DIR=build"
+export "SYMROOT=${SOURCE_ROOT}/../build/ios"
+export "FLUTTER_FRAMEWORK_DIR=/Users/uerceg/Development/Flutter/flutter/bin/cache/artifacts/engine/ios"
+export "FLUTTER_BUILD_NAME=1.0.0"
+export "FLUTTER_BUILD_NUMBER=1"
diff --git a/test/app/lib/main.dart b/test/app/lib/main.dart
@@ -26,15 +26,15 @@ class _MyAppState extends State<MyApp> {
     super.initState();
     initPlatformState();
 
-    String _address = '192.168.8.210';
+    String _address = '192.168.8.222';
     if (Platform.isAndroid) {
       String _protocol = 'https';
       String _port = '8443';
       _baseUrl = _protocol + '://' + _address + ':' + _port;
       _gdprUrl = _protocol + '://' + _address + ':' + _port;
     } else {
       String _protocol = 'http';
-      String _port = '9000';
+      String _port = '8000';
       _baseUrl = _protocol + '://' + _address + ':' + _port;
       _gdprUrl = _protocol + '://' + _address + ':' + _port;
     }

diff --git a/test/ios/AdjustTestLibrary.framework/Versions/A/AdjustTestLibrary b/test/ios/AdjustTestLibrary.framework/Versions/A/AdjustTestLibrary
diff --git a/test/ios/AdjustTestLibrary.framework/Versions/A/Headers/ATLControlChannel.h b/test/ios/AdjustTestLibrary.framework/Versions/A/Headers/ATLControlChannel.h