Skip to content

Commit 085b89f

Browse files
uerceguerceg
authored
Merge pull request #157 from adjust/v504
Version 5.0.4
2 parents b88a3e9 + 09f7e7f commit 085b89f

File tree

27 files changed

+211
-86
lines changed

27 files changed

+211
-86
lines changed

‎CHANGELOG.md

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,18 @@
1+
### Version 5.0.4 (6th February 2025)
2+
#### Added
3+
- Added sending of the additional parameter to improve troubleshooting of `SKAdNetwork` related issues.
4+
5+
#### Fixed
6+
- Fixed occasional occurrences in which ATT waiting interval timer was not being started.
7+
- Fixed occasional NPE occurrences when app was entering background (https://github.com/adjust/android_sdk/issues/630).
8+
- Fixed occasional NPE occurrences when `updateSkanConversionValue` returns `null` as error (https://github.com/adjust/flutter_sdk/issues/156).
9+
10+
#### Native SDKs
11+
- [[email protected]][ios_sdk_v5.1.0]
12+
- [[email protected]][android_sdk_v5.1.0]
13+
14+
---
15+
116
### Version 5.0.3 (6th December 2024)
217
#### Changed
318
- Switched to native Android SDK version that depends on a specific version of the signature library.
@@ -500,6 +515,7 @@ In case you were using beta version of the SDK v5, please switch to the official
500515
[ios_sdk_v4.38.4]: https://github.com/adjust/ios_sdk/tree/v4.38.4
501516
[ios_sdk_v5.0.0]: https://github.com/adjust/ios_sdk/tree/v5.0.0
502517
[ios_sdk_v5.0.1]: https://github.com/adjust/ios_sdk/tree/v5.0.1
518+
[ios_sdk_v5.1.0]: https://github.com/adjust/ios_sdk/tree/v5.1.0
503519

504520
[android_sdk_v4.17.0]: https://github.com/adjust/android_sdk/tree/v4.17.0
505521
[android_sdk_v4.18.0]: https://github.com/adjust/android_sdk/tree/v4.18.0
@@ -527,3 +543,4 @@ In case you were using beta version of the SDK v5, please switch to the official
527543
[android_sdk_v5.0.0]: https://github.com/adjust/android_sdk/tree/v5.0.0
528544
[android_sdk_v5.0.1]: https://github.com/adjust/android_sdk/tree/v5.0.1
529545
[android_sdk_v5.0.2]: https://github.com/adjust/android_sdk/tree/v5.0.2
546+
[android_sdk_v5.1.0]: https://github.com/adjust/android_sdk/tree/v5.1.0

‎VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
5.0.3
1+
5.0.4

‎android/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,5 +37,5 @@ android {
3737
}
3838

3939
dependencies {
40-
implementation 'com.adjust.sdk:adjust-android:5.0.2'
40+
implementation 'com.adjust.sdk:adjust-android:5.1.0'
4141
}

‎android/gradle/wrapper/gradle-wrapper.properties

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
#Thu Feb 17 11:59:04 CET 2022
1+
#Mon Jan 06 12:48:45 CET 2025
22
distributionBase=GRADLE_USER_HOME
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
43
distributionPath=wrapper/dists
5-
zipStorePath=wrapper/dists
4+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip
65
zipStoreBase=GRADLE_USER_HOME
6+
zipStorePath=wrapper/dists

‎example/.metadata

Lines changed: 37 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,42 @@
44
# This file should be version controlled and should not be manually edited.
55

66
version:
7-
revision: cad4d1333eb70e66fe8e993b10fa09306a48269d
8-
channel: master
7+
revision: "761747bfc538b5af34aa0d3fac380f1bc331ec49"
8+
channel: "stable"
99

1010
project_type: app
11+
12+
# Tracks metadata for the flutter migrate command
13+
migration:
14+
platforms:
15+
- platform: root
16+
create_revision: 761747bfc538b5af34aa0d3fac380f1bc331ec49
17+
base_revision: 761747bfc538b5af34aa0d3fac380f1bc331ec49
18+
- platform: android
19+
create_revision: 761747bfc538b5af34aa0d3fac380f1bc331ec49
20+
base_revision: 761747bfc538b5af34aa0d3fac380f1bc331ec49
21+
- platform: ios
22+
create_revision: 761747bfc538b5af34aa0d3fac380f1bc331ec49
23+
base_revision: 761747bfc538b5af34aa0d3fac380f1bc331ec49
24+
- platform: linux
25+
create_revision: 761747bfc538b5af34aa0d3fac380f1bc331ec49
26+
base_revision: 761747bfc538b5af34aa0d3fac380f1bc331ec49
27+
- platform: macos
28+
create_revision: 761747bfc538b5af34aa0d3fac380f1bc331ec49
29+
base_revision: 761747bfc538b5af34aa0d3fac380f1bc331ec49
30+
- platform: web
31+
create_revision: 761747bfc538b5af34aa0d3fac380f1bc331ec49
32+
base_revision: 761747bfc538b5af34aa0d3fac380f1bc331ec49
33+
- platform: windows
34+
create_revision: 761747bfc538b5af34aa0d3fac380f1bc331ec49
35+
base_revision: 761747bfc538b5af34aa0d3fac380f1bc331ec49
36+
37+
# User provided section
38+
39+
# List of Local paths (relative to this file) that should be
40+
# ignored by the migrate tool.
41+
#
42+
# Files that are not part of the templates will be ignored by default.
43+
unmanaged_files:
44+
- 'lib/main.dart'
45+
- 'ios/Runner.xcodeproj/project.pbxproj'

‎example/android/app/build.gradle

Lines changed: 23 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,42 +1,41 @@
1+
plugins {
2+
id "com.android.application"
3+
id "kotlin-android"
4+
// The Flutter Gradle Plugin must be applied after the Android and Kotlin Gradle plugins.
5+
id "dev.flutter.flutter-gradle-plugin"
6+
}
7+
18
def localProperties = new Properties()
2-
def localPropertiesFile = rootProject.file('local.properties')
9+
def localPropertiesFile = rootProject.file("local.properties")
310
if (localPropertiesFile.exists()) {
4-
localPropertiesFile.withReader('UTF-8') { reader ->
11+
localPropertiesFile.withReader("UTF-8") { reader ->
512
localProperties.load(reader)
613
}
714
}
815

9-
def flutterRoot = localProperties.getProperty('flutter.sdk')
10-
if (flutterRoot == null) {
11-
throw new GradleException("Flutter SDK not found. Define location with flutter.sdk in the local.properties file.")
12-
}
13-
14-
def flutterVersionCode = localProperties.getProperty('flutter.versionCode')
16+
def flutterVersionCode = localProperties.getProperty("flutter.versionCode")
1517
if (flutterVersionCode == null) {
16-
flutterVersionCode = '1'
18+
flutterVersionCode = "1"
1719
}
1820

19-
def flutterVersionName = localProperties.getProperty('flutter.versionName')
21+
def flutterVersionName = localProperties.getProperty("flutter.versionName")
2022
if (flutterVersionName == null) {
21-
flutterVersionName = '1.0'
23+
flutterVersionName = "1.0"
2224
}
2325

24-
apply plugin: 'com.android.application'
25-
apply plugin: 'kotlin-android'
26-
apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
27-
2826
android {
29-
compileSdkVersion 33
27+
namespace = "com.adjust.examples"
28+
compileSdk = 34
3029

31-
sourceSets {
32-
main.java.srcDirs += 'src/main/kotlin'
30+
compileOptions {
31+
sourceCompatibility = JavaVersion.VERSION_1_8
32+
targetCompatibility = JavaVersion.VERSION_1_8
3333
}
3434

35-
3635
defaultConfig {
3736
applicationId "com.adjust.examples"
3837
minSdkVersion flutter.minSdkVersion
39-
targetSdkVersion 33
38+
targetSdkVersion 34
4039
versionCode flutterVersionCode.toInteger()
4140
versionName flutterVersionName
4241
}
@@ -45,19 +44,15 @@ android {
4544
release {
4645
// TODO: Add your own signing config for the release build.
4746
// Signing with the debug keys for now, so `flutter run --release` works.
48-
signingConfig signingConfigs.debug
47+
signingConfig = signingConfigs.debug
4948
}
5049
}
51-
lint {
52-
checkReleaseBuilds false
53-
disable 'InvalidPackage'
54-
}
55-
namespace 'com.adjust.examples'
5650
}
5751

5852
flutter {
59-
source '../..'
53+
source = "../.."
6054
}
6155

6256
dependencies {
63-
}
57+
implementation 'com.adjust.sdk:adjust-android:5.1.0'
58+
}

‎example/android/app/src/main/AndroidManifest.xml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,13 @@
3636
<action android:name="android.intent.action.MAIN"/>
3737
<category android:name="android.intent.category.LAUNCHER"/>
3838
</intent-filter>
39+
40+
<intent-filter>
41+
<action android:name="android.intent.action.VIEW" />
42+
<category android:name="android.intent.category.DEFAULT" />
43+
<category android:name="android.intent.category.BROWSABLE" />
44+
<data android:scheme="adjustexample" />
45+
</intent-filter>
3946
</activity>
4047
<!-- Don't delete the meta-data below.
4148
This is used by the Flutter tool to generate GeneratedPluginRegistrant.java -->

‎example/android/app/src/main/kotlin/com/adjust/examples/MainActivity.kt

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,24 @@
11
package com.adjust.examples
22

3+
import android.content.Intent
4+
import android.os.Bundle
5+
import com.adjust.sdk.Adjust
6+
import com.adjust.sdk.AdjustDeeplink
37
import io.flutter.embedding.android.FlutterActivity
48

5-
class MainActivity: FlutterActivity() {
9+
class MainActivity: FlutterActivity(){
10+
override fun onCreate(savedInstanceState: Bundle?) {
11+
super.onCreate(savedInstanceState)
12+
val intent: Intent = intent
13+
val data = intent.data
14+
Adjust.processDeeplink(AdjustDeeplink(data), this)
15+
}
16+
17+
override fun onNewIntent(intent: Intent) {
18+
super.onNewIntent(intent)
19+
val data = intent?.data
20+
Adjust.processDeeplink(AdjustDeeplink(data), this)
21+
}
22+
23+
624
}

‎example/android/app/src/main/res/values/styles.xml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<resources>
3-
<!-- Theme applied to the Android Window while the process is starting -->
4-
<style name="LaunchTheme" parent="@android:style/Theme.Black.NoTitleBar">
3+
<!-- Theme applied to the Android Window while the process is starting when the OS's Dark Mode setting is off -->
4+
<style name="LaunchTheme" parent="@android:style/Theme.Light.NoTitleBar">
55
<!-- Show a splash screen on the activity. Automatically removed when
6-
Flutter draws its first frame -->
6+
the Flutter engine draws its first frame -->
77
<item name="android:windowBackground">@drawable/launch_background</item>
88
</style>
99
<!-- Theme applied to the Android Window as soon as the process has started.
1010
This theme determines the color of the Android Window while your
1111
Flutter UI initializes, as well as behind your Flutter UI while its
1212
running.
13-
13+
1414
This Theme is only used starting with V2 of Flutter's Android embedding. -->
15-
<style name="NormalTheme" parent="@android:style/Theme.Black.NoTitleBar">
16-
<item name="android:windowBackground">@android:color/white</item>
15+
<style name="NormalTheme" parent="@android:style/Theme.Light.NoTitleBar">
16+
<item name="android:windowBackground">?android:colorBackground</item>
1717
</style>
1818
</resources>

‎example/android/build.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ buildscript {
66
}
77

88
dependencies {
9-
classpath 'com.android.tools.build:gradle:8.1.4'
9+
classpath 'com.android.tools.build:gradle:8.8.0'
1010
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
1111
}
1212
}
@@ -18,12 +18,12 @@ allprojects {
1818
}
1919
}
2020

21-
rootProject.buildDir = '../build'
21+
rootProject.buildDir = "../build"
2222
subprojects {
2323
project.buildDir = "${rootProject.buildDir}/${project.name}"
2424
}
2525
subprojects {
26-
project.evaluationDependsOn(':app')
26+
project.evaluationDependsOn(":app")
2727
}
2828

2929
tasks.register("clean", Delete) {

‎example/android/gradle.properties

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
1-
org.gradle.jvmargs=-Xmx1536M
1+
org.gradle.jvmargs=-Xmx4G -XX:+HeapDumpOnOutOfMemoryError
22
android.useAndroidX=true
33
android.enableJetifier=true
4-
org.gradle.java.home=/Applications/Android Studio.app/Contents/jbr/Contents/Home
4+
android.defaults.buildfeatures.buildconfig=true
5+
android.nonTransitiveRClass=false
6+
android.nonFinalResIds=false

‎example/android/gradle/wrapper/gradle-wrapper.properties

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
1-
#Mon Sep 04 10:30:21 CEST 2023
21
distributionBase=GRADLE_USER_HOME
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip
42
distributionPath=wrapper/dists
5-
zipStorePath=wrapper/dists
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip
4+
networkTimeout=10000
5+
validateDistributionUrl=true
66
zipStoreBase=GRADLE_USER_HOME
7+
zipStorePath=wrapper/dists

‎example/android/settings.gradle

Lines changed: 22 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,25 @@
1-
include ':app'
1+
pluginManagement {
2+
def flutterSdkPath = {
3+
def properties = new Properties()
4+
file("local.properties").withInputStream { properties.load(it) }
5+
def flutterSdkPath = properties.getProperty("flutter.sdk")
6+
assert flutterSdkPath != null, "flutter.sdk not set in local.properties"
7+
return flutterSdkPath
8+
}()
29

3-
def localPropertiesFile = new File(rootProject.projectDir, "local.properties")
4-
def properties = new Properties()
10+
includeBuild("$flutterSdkPath/packages/flutter_tools/gradle")
511

6-
assert localPropertiesFile.exists()
7-
localPropertiesFile.withReader("UTF-8") { reader -> properties.load(reader) }
12+
repositories {
13+
google()
14+
mavenCentral()
15+
gradlePluginPortal()
16+
}
17+
}
818

9-
def flutterSdkPath = properties.getProperty("flutter.sdk")
10-
assert flutterSdkPath != null, "flutter.sdk not set in local.properties"
11-
apply from: "$flutterSdkPath/packages/flutter_tools/gradle/app_plugin_loader.gradle"
19+
plugins {
20+
id "dev.flutter.flutter-plugin-loader" version "1.0.0"
21+
id "com.android.application" version '8.8.0' apply false
22+
id "org.jetbrains.kotlin.android" version "1.7.10" apply false
23+
}
24+
25+
include ":app"

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,7 @@
5757
9DF8056024F9215600A001CE /* StoreKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = StoreKit.framework; path = System/Library/Frameworks/StoreKit.framework; sourceTree = SDKROOT; };
5858
9DF8056224F9215B00A001CE /* CoreTelephony.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreTelephony.framework; path = System/Library/Frameworks/CoreTelephony.framework; sourceTree = SDKROOT; };
5959
E1131B9CA4E134D6F01B8E27 /* Pods-Runner.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.debug.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"; sourceTree = "<group>"; };
60+
E4C0BB812D37D39D005D23F8 /* Runner.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = Runner.entitlements; sourceTree = "<group>"; };
6061
/* End PBXFileReference section */
6162

6263
/* Begin PBXFrameworksBuildPhase section */
@@ -118,6 +119,7 @@
118119
97C146F01CF9000F007C117D /* Runner */ = {
119120
isa = PBXGroup;
120121
children = (
122+
E4C0BB812D37D39D005D23F8 /* Runner.entitlements */,
121123
97C146FA1CF9000F007C117D /* Main.storyboard */,
122124
97C146FD1CF9000F007C117D /* Assets.xcassets */,
123125
97C146FF1CF9000F007C117D /* LaunchScreen.storyboard */,
@@ -378,6 +380,7 @@
378380
buildSettings = {
379381
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
380382
CLANG_ENABLE_MODULES = YES;
383+
CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
381384
CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
382385
DEVELOPMENT_TEAM = QGUGW9AUMK;
383386
ENABLE_BITCODE = NO;
@@ -518,6 +521,7 @@
518521
buildSettings = {
519522
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
520523
CLANG_ENABLE_MODULES = YES;
524+
CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
521525
CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
522526
DEVELOPMENT_TEAM = QGUGW9AUMK;
523527
ENABLE_BITCODE = NO;
@@ -550,6 +554,7 @@
550554
buildSettings = {
551555
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
552556
CLANG_ENABLE_MODULES = YES;
557+
CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
553558
CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
554559
DEVELOPMENT_TEAM = QGUGW9AUMK;
555560
ENABLE_BITCODE = NO;

‎example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
</Testables>
4141
</TestAction>
4242
<LaunchAction
43-
buildConfiguration = "Debug"
43+
buildConfiguration = "Profile"
4444
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
4545
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
4646
launchStyle = "0"

0 commit comments

Comments
 (0)