Merge pull request #508 from adjust/v4285

shashanksu · web-flow · commit 28045ca0717b · 2021-09-22T10:45:23.000+02:00
Version 4.28.5
diff --git a/Adjust/build.gradle b/Adjust/build.gradle
@@ -9,7 +9,7 @@ ext {
     coreMinSdkVersion = 9
     coreCompileSdkVersion = 30
     coreTargetSdkVersion = 30
-    coreVersionName = '4.28.4'
+    coreVersionName = '4.28.5'
     defaultVersionCode = 1
     webbridgeMinSdkVersion = 17
 
diff --git a/Adjust/sdk-core/src/main/java/com/adjust/sdk/Adjust.java b/Adjust/sdk-core/src/main/java/com/adjust/sdk/Adjust.java
@@ -32,7 +32,7 @@ private Adjust() {
      */
     public static synchronized AdjustInstance getDefaultInstance() {
         @SuppressWarnings("unused")
-        String VERSION = "!SDK-VERSION-STRING!:com.adjust.sdk:adjust-android:4.28.4";
+        String VERSION = "!SDK-VERSION-STRING!:com.adjust.sdk:adjust-android:4.28.5";
 
         if (defaultInstance == null) {
             defaultInstance = new AdjustInstance();
diff --git a/Adjust/sdk-core/src/main/java/com/adjust/sdk/AdjustConfig.java b/Adjust/sdk-core/src/main/java/com/adjust/sdk/AdjustConfig.java
@@ -55,6 +55,7 @@ public class AdjustConfig {
     public static final String AD_REVENUE_MOPUB = "mopub";
     public static final String AD_REVENUE_ADMOB = "admob_sdk";
     public static final String AD_REVENUE_IRONSOURCE = "ironsource_sdk";
+    public static final String AD_REVENUE_ADMOST = "admost_sdk";
 
     public AdjustConfig(Context context, String appToken, String environment) {
         init(context, appToken, environment, false);
diff --git a/Adjust/sdk-core/src/main/java/com/adjust/sdk/Constants.java b/Adjust/sdk-core/src/main/java/com/adjust/sdk/Constants.java
@@ -29,7 +29,7 @@ public interface Constants {
 
     String SCHEME = "https";
     String AUTHORITY = "app.adjust.com";
-    String CLIENT_SDK = "android4.28.4";
+    String CLIENT_SDK = "android4.28.5";
     String LOGTAG = "Adjust";
     String REFTAG = "reftag";
     String INSTALL_REFERRER = "install_referrer";
diff --git a/Adjust/sdk-plugin-criteo/build.gradle b/Adjust/sdk-plugin-criteo/build.gradle
@@ -25,7 +25,7 @@ dependencies {
     // Add SDK via module.
     compileOnly project(':sdk-core')
     // Add SDK via Maven.
-    // implementation 'com.adjust.sdk:adjust-android:4.28.4'
+    // implementation 'com.adjust.sdk:adjust-android:4.28.5'
 }
 
 task adjustCriteoAndroidAar (type: Copy) {
diff --git a/Adjust/sdk-plugin-imei/build.gradle b/Adjust/sdk-plugin-imei/build.gradle
@@ -24,7 +24,7 @@ dependencies {
     // Add SDK via module.
     compileOnly project(':sdk-core')
     // Add SDK via Maven.
-    // implementation 'com.adjust.sdk:adjust-android:4.28.4'
+    // implementation 'com.adjust.sdk:adjust-android:4.28.5'
 }
 
 task adjustImeiAndroidAar (type: Copy) {
diff --git a/Adjust/sdk-plugin-oaid/build.gradle b/Adjust/sdk-plugin-oaid/build.gradle
@@ -24,7 +24,7 @@ dependencies {
     // Add SDK via module.
     compileOnly project(':sdk-core')
     // Add SDK via Maven.
-    // implementation 'com.adjust.sdk:adjust-android:4.28.4'
+    // implementation 'com.adjust.sdk:adjust-android:4.28.5'
 }
 
 task adjustOaidAndroidAar (type: Copy) {
diff --git a/Adjust/sdk-plugin-sociomantic/build.gradle b/Adjust/sdk-plugin-sociomantic/build.gradle
@@ -24,7 +24,7 @@ dependencies {
     // Add SDK via module.
     compileOnly project(':sdk-core')
     // Add SDK via Maven.
-    // implementation 'com.adjust.sdk:adjust-android:4.28.4'
+    // implementation 'com.adjust.sdk:adjust-android:4.28.5'
 }
 
 task adjustSociomanticAndroidAar (type: Copy) {
diff --git a/Adjust/sdk-plugin-trademob/build.gradle b/Adjust/sdk-plugin-trademob/build.gradle
@@ -24,7 +24,7 @@ dependencies {
     // Add SDK via module.
     compileOnly project(':sdk-core')
     // Add SDK via Maven.
-    // implementation 'com.adjust.sdk:adjust-android:4.28.4'
+    // implementation 'com.adjust.sdk:adjust-android:4.28.5'
 }
 
 task adjustTrademobAndroidAar (type: Copy) {
diff --git a/Adjust/sdk-plugin-webbridge/build.gradle b/Adjust/sdk-plugin-webbridge/build.gradle
@@ -24,7 +24,7 @@ dependencies {
     // Add SDK via module.
     compileOnly project(':sdk-core')
     // Add SDK via Maven.
-    // implementation 'com.adjust.sdk:adjust-android:4.28.4'
+    // implementation 'com.adjust.sdk:adjust-android:4.28.5'
 }
 
 task adjustWebBridgeAndroidAar (type: Copy) {
diff --git a/Adjust/sdk-plugin-webbridge/src/main/assets/adjust.js b/Adjust/sdk-plugin-webbridge/src/main/assets/adjust.js
@@ -211,7 +211,7 @@ var Adjust = {
         if (this.adjustConfig) {
             return this.adjustConfig.getSdkPrefix();
         } else {
-            return 'web-bridge4.28.4';
+            return 'web-bridge4.28.5';
         }
     },
 
diff --git a/Adjust/test-unit/src/androidTest/java/com/adjust/sdk/TestActivityPackage.java b/Adjust/test-unit/src/androidTest/java/com/adjust/sdk/TestActivityPackage.java
@@ -53,7 +53,7 @@ public TestActivityPackage(ActivityPackage activityPackage) {
         // default values
         appToken = "123456789012";
         environment = "sandbox";
-        clientSdk = "android4.28.4";
+        clientSdk = "android4.28.5";
         suffix = "";
         attribution = new AdjustAttribution();
         playServices = true;
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,9 @@
+### Version 4.28.5 (22nd September 2021)
+#### Added
+- Added support for `Admost` ad revenue tracking.
+
+---
+
 ### Version 4.28.4 (9th August 2021)
 #### Added
 - Added support for Android TV.
diff --git a/README.md b/README.md
@@ -113,14 +113,14 @@ These are the minimum required steps to integrate the Adjust SDK in your Android
 If you are using Maven, add the following to your `build.gradle` file:
 
 ```gradle
-implementation 'com.adjust.sdk:adjust-android:4.28.4'
+implementation 'com.adjust.sdk:adjust-android:4.28.5'
 implementation 'com.android.installreferrer:installreferrer:2.2'
 ```
 
 If you would prefer to use the Adjust SDK inside web views in your app, please include this additional dependency as well:
 
 ```gradle
-implementation 'com.adjust.sdk:adjust-android-webbridge:4.28.4'
+implementation 'com.adjust.sdk:adjust-android-webbridge:4.28.5'
 ```
 
 **Note**: The minimum supported Android API level for the web view extension is 17 (Jelly Bean).
@@ -152,6 +152,16 @@ If you are **not targeting the Google Play Store**, you must also add the follow
 <uses-permission android:name="android.permission.ACCESS_WIFI_STATE"/>
 ```
 
+#### <a id="gps-adid-permission"></a>Add permission to gather Google advertising ID
+
+If you are targeting Android 12 and above (API level 31), you need to add the `com.google.android.gms.AD_ID` permission to read the device's advertising ID. Add the following line to your `AndroidManifest.xml` to enable the permission.
+
+```xml
+<uses-permission android:name="com.google.android.gms.permission.AD_ID"/>
+```
+
+For more information, see [Google's `AdvertisingIdClient.Info` documentation](https://developers.google.com/android/reference/com/google/android/gms/ads/identifier/AdvertisingIdClient.Info#public-string-getid).
+
 ### <a id="qs-proguard"></a>Proguard settings
 
 If you are using Proguard, add these lines to your Proguard file:
@@ -1624,6 +1634,10 @@ The Adjust SDK offers you the possibility to obtain device identifiers.
 
 ### <a id="af-gps-adid"></a>Google Play Services Advertising Identifier
 
+The Google Play Services Advertising Identifier (Google advertising ID) is a unique identifier for a device. Users can opt out of sharing their Google advertising ID by toggling the "Opt out of Ads Personalization" setting on their device. When a user has enabled this setting, the Adjust SDK returns a string of zeros when trying to read the Google advertising ID.
+
+> **Important**: If you are targeting Android 12 and above (API level 31), you need to add the [`com.google.android.gms.AD_ID` permission](#gps-adid-permission) to your app. If you do not add this permission, you will not be able to read the Google advertising ID even if the user has not opted out of sharing their ID.
+
 Certain services (such as Google Analytics) require you to coordinate advertising IDs and client IDs in order to prevent duplicate reporting.
 
 <table>
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-4.28.4
+4.28.5
diff --git a/doc/chinese/README.md b/doc/chinese/README.md
@@ -112,14 +112,14 @@
 如果您使用的是 Maven，请添加下行到您的 `build.gradle` 文件：
 
 ```gradle
-implementation 'com.adjust.sdk:adjust-android:4.28.4'
+implementation 'com.adjust.sdk:adjust-android:4.28.5'
 implementation 'com.android.installreferrer:installreferrer:2.2'
 ```
 
 如果您想在应用 web view 中使用 Adjust SDK，请也添加下列附加依赖项：
 
 ```gradle
-implementation 'com.adjust.sdk:adjust-android-webbridge:4.28.4'
+implementation 'com.adjust.sdk:adjust-android-webbridge:4.28.5'
 ```
 
 **请注意:** web view 扩展支持的最低安卓 API 级别为 17 (Jelly Bean)。
diff --git a/doc/chinese/plugins/oaid.md b/doc/chinese/plugins/oaid.md
@@ -13,8 +13,8 @@ OAID 是由移动安全联盟 (MSA) 推出的广告 ID。所有中国国内的
 如果您使用的是 Maven，请将以下 OAID 插件依赖项添加到现有 Adjust SDK 依赖项旁的 `build.gradle` 文件：
 
 ```
-implementation 'com.adjust.sdk:adjust-android:4.28.4'
-implementation 'com.adjust.sdk:adjust-android-oaid:4.28.4'
+implementation 'com.adjust.sdk:adjust-android:4.28.5'
+implementation 'com.adjust.sdk:adjust-android-oaid:4.28.5'
 ```
 
 您还可以将 Adjust OAID 插件作为 JAR 文件进行添加，该文件可从我们的 [版本页面][releases] 下载。
diff --git a/doc/english/migration/migrate.md b/doc/english/migration/migrate.md
@@ -1,4 +1,4 @@
-## Migrate your Adjust SDK for Android to 4.28.4 from 3.6.2
+## Migrate your Adjust SDK for Android to 4.28.5 from 3.6.2
 
 ### The Application class
 
diff --git a/doc/english/plugins/oaid.md b/doc/english/plugins/oaid.md
@@ -12,8 +12,8 @@ To enable the Adjust SDK to collect and track OAID, follow these steps. To only
 If you are using Maven, add the following OAID plugin dependency to your `build.gradle` file next to the existing Adjust SDK dependency:
 
 ```
-implementation 'com.adjust.sdk:adjust-android:4.28.4'
-implementation 'com.adjust.sdk:adjust-android-oaid:4.28.4'
+implementation 'com.adjust.sdk:adjust-android:4.28.5'
+implementation 'com.adjust.sdk:adjust-android-oaid:4.28.5'
 ```
 
 You can also add the Adjust OAID plugin as JAR file, which you can download from our [releases page][releases].
diff --git a/doc/japanese/README.md b/doc/japanese/README.md
@@ -111,14 +111,14 @@ Adjust SDKをAndroidプロジェクトに実装する手順を説明します。
 Mavenを使用している場合は、以下の内容を`build.gradle`ファイルに追加します。file:
 
 ```gradle
-implementation 'com.adjust.sdk:adjust-android:4.28.4'
+implementation 'com.adjust.sdk:adjust-android:4.28.5'
 implementation 'com.android.installreferrer:installreferrer:2.2'
 ```
 
 アプリの WebView内でAdjust SDKを使用したい場合は、以下のdependencyを追加してください。
 
 ```gradle
-implementation 'com.adjust.sdk:adjust-android-webbridge:4.28.4'
+implementation 'com.adjust.sdk:adjust-android-webbridge:4.28.5'
 ```
 
 **注意**：WebView拡張機能用にサポートされている最小のAndroid APIレベルは17（Jelly Bean）です。
diff --git a/doc/japanese/migration/migrate.md b/doc/japanese/migration/migrate.md
@@ -1,4 +1,4 @@
-## Android用adjust SDKのv3.6.2からv4.28.4への移行
+## Android用adjust SDKのv3.6.2からv4.28.5への移行
 
 ### アプリケーションクラス
 
diff --git a/doc/japanese/plugins/oaid.md b/doc/japanese/plugins/oaid.md
@@ -13,8 +13,8 @@ Adjust SDKがOAID値を収集し計測するための設定手順は、以下の
 Mavenを使用している場合は、以下のOAIDプラグイン dependencyを、既存のAdjust SDKのdependencyの隣にあるbuild.gradle` file に追加します：
 
 ```
-implementation 'com.adjust.sdk:adjust-android:4.28.4'
-implementation 'com.adjust.sdk:adjust-android-oaid:4.28.4'
+implementation 'com.adjust.sdk:adjust-android:4.28.5'
+implementation 'com.adjust.sdk:adjust-android-oaid:4.28.5'
 ```
 
 Adjust OAIDプラグインを JARファイルとして追加することもできます。JARファイルは、[releases page][releases] からダウンロードすることができます。
diff --git a/doc/korean/README.md b/doc/korean/README.md
@@ -114,14 +114,14 @@ Adjust™의 Android SDK에 관한 문서입니다. Adjust™에 대한 자세
 Maven을 사용하는 경우, 다음을 `build.gradle` 파일에 추가하시기 바랍니다.
 
 ```gradle
-implementation 'com.adjust.sdk:adjust-android:4.28.4'
+implementation 'com.adjust.sdk:adjust-android:4.28.5'
 implementation 'com.android.installreferrer:installreferrer:2.2'
 ```
 
 앱의 웹뷰 안에서 Adjust SDK를 사용하고자 하는 경우, 다음의 추가적인 dependency를 추가하시기 바랍니다.
 
 ```gradle
-implementation 'com.adjust.sdk:adjust-android-webbridge:4.28.4'
+implementation 'com.adjust.sdk:adjust-android-webbridge:4.28.5'
 ```
 
 **참고**: 웹뷰 확장에 필요한 Android API의 최소 지원 레벨은 17(Jelley Bean)입니다.
diff --git a/doc/korean/plugins/oaid.md b/doc/korean/plugins/oaid.md
@@ -14,8 +14,8 @@ Adjust SDK가 OAID를 수집하고 트래킹할 수 있게 하기 위해서는 
 Maven을 사용하고 있는 경우, 기존 Adjust SDK dependency 옆에 있는 `build.gradle` 파일에 다음의 OAID plugin dependency을 추가하세요.
 
 ```
-implementation 'com.adjust.sdk:adjust-android:4.28.4'
-implementation 'com.adjust.sdk:adjust-android-oaid:4.28.4'
+implementation 'com.adjust.sdk:adjust-android:4.28.5'
+implementation 'com.adjust.sdk:adjust-android-oaid:4.28.5'
 ```
 
 Adjust OAID 플러그인을 JAR 파일로 추가할 수도 있습니다. Adjust [릴리스 페이지][releases]에서 다운로드하세요.

Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ dependencies {`
`25`	`25`	`// Add SDK via module.`
`26`	`26`	`compileOnly project(':sdk-core')`
`27`	`27`	`// Add SDK via Maven.`
`28`		`- // implementation 'com.adjust.sdk:adjust-android:4.28.4'`
	`28`	`+ // implementation 'com.adjust.sdk:adjust-android:4.28.5'`
`29`	`29`	`}`
`30`	`30`
`31`	`31`	`task adjustCriteoAndroidAar (type: Copy) {`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ dependencies {`
`24`	`24`	`// Add SDK via module.`
`25`	`25`	`compileOnly project(':sdk-core')`
`26`	`26`	`// Add SDK via Maven.`
`27`		`- // implementation 'com.adjust.sdk:adjust-android:4.28.4'`
	`27`	`+ // implementation 'com.adjust.sdk:adjust-android:4.28.5'`
`28`	`28`	`}`
`29`	`29`
`30`	`30`	`task adjustImeiAndroidAar (type: Copy) {`