From 2930ec5fab02821fe79a0e6f117025ba7ebfc1c5 Mon Sep 17 00:00:00 2001 From: Shashank Suhane Date: Tue, 18 Jan 2022 15:04:37 +0100 Subject: [PATCH 01/12] Update README.md --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index d687727..731d5ea 100644 --- a/README.md +++ b/README.md @@ -117,10 +117,10 @@ flutter packages get Since the 1st of August of 2014, apps in the Google Play Store must use the [Google Advertising ID][google-ad-id] to uniquely identify devices. To allow the Adjust SDK to use the Google Advertising ID, you must integrate the [Google Play Services][google-play-services]. If you haven't done this yet, please add dependency to Google Play Services library by adding following dependecy to your `dependencies` block of app's `build.gradle` file for Android platform: ```gradle -implementation 'com.google.android.gms:play-services-analytics:16.0.4' +implementation 'com.google.android.gms:play-services-ads-identifier:18.0.1' ``` -**Note**: The Adjust SDK is not tied to any specific version of the `play-services-analytics` part of the Google Play Services library, so feel free to always use the latest version of it (or whichever you might need). +**Note**: The Adjust SDK is not tied to any specific version of the `play-services-analytics` part of the Google Play Services library. You can use the latest version of the library, or any other version you need. ### [Android] Add permissions From 2210699d396e8a6c9317e8beb574e8e04a0e1dcc Mon Sep 17 00:00:00 2001 From: Shashank Suhane Date: Tue, 18 Jan 2022 15:35:52 +0100 Subject: [PATCH 02/12] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 731d5ea..6dca2fa 100644 --- a/README.md +++ b/README.md @@ -120,7 +120,7 @@ Since the 1st of August of 2014, apps in the Google Play Store must use the [Goo implementation 'com.google.android.gms:play-services-ads-identifier:18.0.1' ``` -**Note**: The Adjust SDK is not tied to any specific version of the `play-services-analytics` part of the Google Play Services library. You can use the latest version of the library, or any other version you need. +**Note**: The Adjust SDK is not tied to any specific version of the `play-services-ads-identifier` part of the Google Play Services library. You can use the latest version of the library, or any other version you need. ### [Android] Add permissions From 793f4ad95cdec713bd1f539c3416573b373da742 Mon Sep 17 00:00:00 2001 From: Jami Couch Date: Thu, 13 Jan 2022 15:17:05 -0600 Subject: [PATCH 03/12] [maven-central] Swap jcenter() to mavenCentral() --- android/build.gradle | 4 ++-- example/android/build.gradle | 4 ++-- test/android/build.gradle | 4 ++-- test/app/android/build.gradle | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/android/build.gradle b/android/build.gradle index 175aea1..a523844 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -3,7 +3,7 @@ version '1.0-SNAPSHOT' buildscript { repositories { google() - jcenter() + mavenCentral() } dependencies { @@ -13,7 +13,7 @@ buildscript { rootProject.allprojects { repositories { google() - jcenter() + mavenCentral() } gradle.projectsEvaluated { diff --git a/example/android/build.gradle b/example/android/build.gradle index 6c23456..f190ed6 100644 --- a/example/android/build.gradle +++ b/example/android/build.gradle @@ -2,7 +2,7 @@ buildscript { ext.kotlin_version = '1.5.10' repositories { google() - jcenter() + mavenCentral() } dependencies { @@ -14,7 +14,7 @@ buildscript { allprojects { repositories { google() - jcenter() + mavenCentral() } } diff --git a/test/android/build.gradle b/test/android/build.gradle index 5c1511a..23ecb92 100644 --- a/test/android/build.gradle +++ b/test/android/build.gradle @@ -4,7 +4,7 @@ version '1.0-SNAPSHOT' buildscript { repositories { google() - jcenter() + mavenCentral() } dependencies { @@ -15,7 +15,7 @@ buildscript { rootProject.allprojects { repositories { google() - jcenter() + mavenCentral() } } diff --git a/test/app/android/build.gradle b/test/app/android/build.gradle index 6c23456..f190ed6 100644 --- a/test/app/android/build.gradle +++ b/test/app/android/build.gradle @@ -2,7 +2,7 @@ buildscript { ext.kotlin_version = '1.5.10' repositories { google() - jcenter() + mavenCentral() } dependencies { @@ -14,7 +14,7 @@ buildscript { allprojects { repositories { google() - jcenter() + mavenCentral() } } From e90be8c7547e1a37df62fbf53093a81270de9bff Mon Sep 17 00:00:00 2001 From: uerceg Date: Thu, 27 Jan 2022 00:03:46 +0100 Subject: [PATCH 04/12] update version number to 4.29.2 --- README.md | 2 +- VERSION | 2 +- ios/adjust_sdk.podspec | 2 +- lib/adjust.dart | 2 +- pubspec.yaml | 2 +- test/ios/test_lib.podspec | 2 +- test/pubspec.yaml | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index 6dca2fa..8c0e22d 100644 --- a/README.md +++ b/README.md @@ -101,7 +101,7 @@ You can add Adjust SDK to your Flutter app by adding following to your `pubspec. ```yaml dependencies: - adjust_sdk: ^4.29.1 + adjust_sdk: ^4.29.2 ``` Then navigate to your project in the terminal and run: diff --git a/VERSION b/VERSION index 2ff15b2..3660d52 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -4.29.1 +4.29.2 diff --git a/ios/adjust_sdk.podspec b/ios/adjust_sdk.podspec index 5e8164c..831b5ed 100644 --- 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.29.1' + s.version = '4.29.2' s.summary = 'Adjust Flutter SDK for iOS platform' s.description = <<-DESC Adjust Flutter SDK for iOS platform. diff --git a/lib/adjust.dart b/lib/adjust.dart index 5d8426c..4099853 100644 --- a/lib/adjust.dart +++ b/lib/adjust.dart @@ -19,7 +19,7 @@ import 'package:flutter/services.dart'; import 'package:meta/meta.dart'; class Adjust { - static const String _sdkPrefix = 'flutter4.29.1'; + static const String _sdkPrefix = 'flutter4.29.2'; static const MethodChannel _channel = const MethodChannel('com.adjust.sdk/api'); diff --git a/pubspec.yaml b/pubspec.yaml index 157ab78..b858dd2 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -1,7 +1,7 @@ name: adjust_sdk description: This is the Flutter SDK of Adjust™. You can read more about Adjust™ at adjust.com. homepage: https://github.com/adjust/flutter_sdk -version: 4.29.1 +version: 4.29.2 environment: sdk: ">=2.12.0 <3.0.0" diff --git a/test/ios/test_lib.podspec b/test/ios/test_lib.podspec index 82fecbd..b7be982 100644 --- a/test/ios/test_lib.podspec +++ b/test/ios/test_lib.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = 'test_lib' - s.version = '4.29.1' + s.version = '4.29.2' s.summary = 'Adjust test library Flutter plugin' s.description = <<-DESC A new flutter plugin project. diff --git a/test/pubspec.yaml b/test/pubspec.yaml index 7d17b23..719d9a7 100644 --- a/test/pubspec.yaml +++ b/test/pubspec.yaml @@ -1,6 +1,6 @@ name: test_lib description: Flutter plugin for Adjust Testing Library. Intended exclusively for internal use. -version: 4.29.1 +version: 4.29.2 author: Serj (srdjan@adjust.com) environment: From 0a23da5b4c65a6b972f84d3f5e5c30f50ef5a80b Mon Sep 17 00:00:00 2001 From: uerceg Date: Thu, 27 Jan 2022 00:04:23 +0100 Subject: [PATCH 05/12] update native Android SDK dependency --- android/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/android/build.gradle b/android/build.gradle index a523844..9e99143 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -36,5 +36,5 @@ android { } dependencies { - api 'com.adjust.sdk:adjust-android:4.28.5' + api 'com.adjust.sdk:adjust-android:4.28.9' } From da9f54de25fd708fd52316275e01b20aa25a9daf Mon Sep 17 00:00:00 2001 From: uerceg Date: Thu, 17 Feb 2022 14:28:11 +0100 Subject: [PATCH 06/12] update dependencies and cleanups --- android/build.gradle | 6 +++--- android/gradle/wrapper/gradle-wrapper.properties | 6 +++--- .../java/com/adjust/sdk/flutter/AdjustSdk.java | 2 +- .../java/com/adjust/sdk/flutter/AdjustUtils.java | 2 +- example/android/app/build.gradle | 13 ++++++------- example/android/app/src/main/AndroidManifest.xml | 3 ++- example/android/build.gradle | 4 ++-- example/android/gradle.properties | 1 - .../gradle/wrapper/gradle-wrapper.properties | 2 +- example/ios/Podfile.lock | 16 ++++++++-------- ios/Classes/AdjustSdk.h | 2 +- ios/Classes/AdjustSdk.m | 2 +- ios/Classes/AdjustSdkDelegate.h | 2 +- ios/Classes/AdjustSdkDelegate.m | 2 +- ios/adjust_sdk.podspec | 4 ++-- lib/adjust.dart | 2 +- lib/adjust_ad_revenue.dart | 2 +- lib/adjust_app_store_subscription.dart | 2 +- lib/adjust_attribution.dart | 2 +- lib/adjust_config.dart | 2 +- lib/adjust_event.dart | 2 +- lib/adjust_event_failure.dart | 2 +- lib/adjust_event_success.dart | 2 +- lib/adjust_play_store_subscription.dart | 2 +- lib/adjust_session_failure.dart | 2 +- lib/adjust_session_success.dart | 2 +- lib/adjust_third_party_sharing.dart | 2 +- test/android/build.gradle | 4 ++-- .../gradle/wrapper/gradle-wrapper.properties | 6 ++++++ test/app/.flutter-plugins-dependencies | 2 +- test/app/android/app/build.gradle | 13 ++++++------- .../app/android/app/src/main/AndroidManifest.xml | 3 ++- test/app/android/build.gradle | 4 ++-- test/app/android/gradle.properties | 1 - .../gradle/wrapper/gradle-wrapper.properties | 2 +- test/app/lib/main.dart | 2 +- 36 files changed, 66 insertions(+), 62 deletions(-) create mode 100644 test/android/gradle/wrapper/gradle-wrapper.properties diff --git a/android/build.gradle b/android/build.gradle index 9e99143..e52a8a2 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -7,7 +7,7 @@ buildscript { } dependencies { - classpath('com.android.tools.build:gradle:4.1.1') + classpath('com.android.tools.build:gradle:7.1.1') } } rootProject.allprojects { @@ -24,7 +24,7 @@ rootProject.allprojects { } apply plugin: 'com.android.library' android { - compileSdkVersion 30 + compileSdkVersion 32 defaultConfig { minSdkVersion 16 @@ -36,5 +36,5 @@ android { } dependencies { - api 'com.adjust.sdk:adjust-android:4.28.9' + api 'com.adjust.sdk:adjust-android:4.29.1' } diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties index b72edb0..17fa29b 100644 --- a/android/gradle/wrapper/gradle-wrapper.properties +++ b/android/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Tue Apr 24 23:20:29 CEST 2018 +#Thu Feb 17 11:59:04 CET 2022 distributionBase=GRADLE_USER_HOME +distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip distributionPath=wrapper/dists -zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-all.zip +zipStoreBase=GRADLE_USER_HOME diff --git a/android/src/main/java/com/adjust/sdk/flutter/AdjustSdk.java b/android/src/main/java/com/adjust/sdk/flutter/AdjustSdk.java index f8bfe61..0ad4d72 100644 --- a/android/src/main/java/com/adjust/sdk/flutter/AdjustSdk.java +++ b/android/src/main/java/com/adjust/sdk/flutter/AdjustSdk.java @@ -3,7 +3,7 @@ // Adjust SDK // // Created by Srdjan Tubin (@2beens) on 25th April 2018. -// Copyright (c) 2018-2021 Adjust GmbH. All rights reserved. +// Copyright (c) 2018-Present Adjust GmbH. All rights reserved. // package com.adjust.sdk.flutter; diff --git a/android/src/main/java/com/adjust/sdk/flutter/AdjustUtils.java b/android/src/main/java/com/adjust/sdk/flutter/AdjustUtils.java index 596f213..ea252df 100644 --- a/android/src/main/java/com/adjust/sdk/flutter/AdjustUtils.java +++ b/android/src/main/java/com/adjust/sdk/flutter/AdjustUtils.java @@ -3,7 +3,7 @@ // Adjust SDK // // Created by Srdjan Tubin (@2beens) on 5th May 2018. -// Copyright (c) 2018-2021 Adjust GmbH. All rights reserved. +// Copyright (c) 2018-Present Adjust GmbH. All rights reserved. // package com.adjust.sdk.flutter; diff --git a/example/android/app/build.gradle b/example/android/app/build.gradle index a55f5d8..546eb71 100644 --- a/example/android/app/build.gradle +++ b/example/android/app/build.gradle @@ -26,21 +26,17 @@ apply plugin: 'kotlin-android' apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle" android { - compileSdkVersion 30 + compileSdkVersion 32 sourceSets { main.java.srcDirs += 'src/main/kotlin' } - lintOptions { - disable 'InvalidPackage' - checkReleaseBuilds false - } defaultConfig { applicationId "com.adjust.examples" minSdkVersion 16 - targetSdkVersion 30 + targetSdkVersion 32 versionCode flutterVersionCode.toInteger() versionName flutterVersionName } @@ -52,6 +48,10 @@ android { signingConfig signingConfigs.debug } } + lint { + checkReleaseBuilds false + disable 'InvalidPackage' + } } flutter { @@ -59,5 +59,4 @@ flutter { } dependencies { - implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" } diff --git a/example/android/app/src/main/AndroidManifest.xml b/example/android/app/src/main/AndroidManifest.xml index 168d205..8c7eb34 100644 --- a/example/android/app/src/main/AndroidManifest.xml +++ b/example/android/app/src/main/AndroidManifest.xml @@ -14,7 +14,8 @@ android:theme="@style/LaunchTheme" android:configChanges="orientation|keyboardHidden|keyboard|screenSize|smallestScreenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode" android:hardwareAccelerated="true" - android:windowSoftInputMode="adjustResize"> + android:windowSoftInputMode="adjustResize" + android:exported="true">