Skip to content

Commit b88a3e9

Browse files
uerceguerceg
authored
Merge pull request #151 from adjust/v503
Version 5.0.3
2 parents 71c4742 + 7f1a72b commit b88a3e9

File tree

21 files changed

+92
-78
lines changed

21 files changed

+92
-78
lines changed

‎CHANGELOG.md

+11
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,13 @@
1+
### Version 5.0.3 (6th December 2024)
2+
#### Changed
3+
- Switched to native Android SDK version that depends on a specific version of the signature library.
4+
5+
#### Native SDKs
6+
- [iOS@v5.0.1][ios_sdk_v5.0.1]
7+
- [Android@v5.0.2][android_sdk_v5.0.2]
8+
9+
---
10+
111
### Version 5.0.2 (23rd September 2024)
212
#### Fixed
313
- Fixed `Adjust.modulemap not found` error in certain CocoaPods integration cases.
@@ -516,3 +526,4 @@ In case you were using beta version of the SDK v5, please switch to the official
516526
[android_sdk_v4.38.5]: https://github.com/adjust/android_sdk/tree/v4.38.5
517527
[android_sdk_v5.0.0]: https://github.com/adjust/android_sdk/tree/v5.0.0
518528
[android_sdk_v5.0.1]: https://github.com/adjust/android_sdk/tree/v5.0.1
529+
[android_sdk_v5.0.2]: https://github.com/adjust/android_sdk/tree/v5.0.2

‎VERSION

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
5.0.2
1+
5.0.3

‎android/build.gradle

+1-1
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.1'
40+
implementation 'com.adjust.sdk:adjust-android:5.0.2'
4141
}

‎ios/adjust_sdk.podspec

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Pod::Spec.new do |s|
22
s.name = 'adjust_sdk'
3-
s.version = '5.0.2'
3+
s.version = '5.0.3'
44
s.summary = 'Adjust Flutter SDK for iOS platform'
55
s.description = <<-DESC
66
Adjust Flutter SDK for iOS platform.

‎lib/adjust.dart

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ import 'package:flutter/services.dart';
2424
import 'package:meta/meta.dart';
2525

2626
class Adjust {
27-
static const String _sdkPrefix = 'flutter5.0.2';
27+
static const String _sdkPrefix = 'flutter5.0.3';
2828
static const MethodChannel _channel =
2929
const MethodChannel('com.adjust.sdk/api');
3030

‎pubspec.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
name: adjust_sdk
22
description: This is the Flutter SDK of Adjust™. You can read more about Adjust™ at adjust.com.
33
homepage: https://github.com/adjust/flutter_sdk
4-
version: 5.0.2
4+
version: 5.0.3
55

66
environment:
77
sdk: ">=2.12.0 <3.0.0"

‎test/android/build.gradle

+2-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,8 @@ rootProject.allprojects {
2525
apply plugin: 'com.android.library'
2626

2727
android {
28-
compileSdkVersion 32
28+
namespace 'com.adjust.test.lib'
29+
compileSdkVersion 35
2930

3031
defaultConfig {
3132
minSdkVersion 16

‎test/android/src/main/AndroidManifest.xml

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,2 @@
1-
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
2-
package="com.adjust.test.lib">
1+
<manifest xmlns:android="http://schemas.android.com/apk/res/android">
32
</manifest>

‎test/android/src/main/java/com/adjust/test/lib/TestLibPlugin.java

+5-31
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,13 @@
1212
import android.os.Looper;
1313
import android.util.Log;
1414

15+
import androidx.annotation.NonNull;
16+
1517
import io.flutter.embedding.engine.plugins.FlutterPlugin;
1618
import io.flutter.plugin.common.MethodCall;
1719
import io.flutter.plugin.common.MethodChannel;
1820
import io.flutter.plugin.common.MethodChannel.MethodCallHandler;
1921
import io.flutter.plugin.common.MethodChannel.Result;
20-
import io.flutter.plugin.common.PluginRegistry.Registrar;
2122

2223
import com.adjust.test.ICommandJsonListener;
2324
import com.adjust.test.TestLibrary;
@@ -30,50 +31,23 @@ public class TestLibPlugin implements FlutterPlugin, MethodCallHandler {
3031
private static String TAG = "TestLibPlugin";
3132
private TestLibrary testLibrary = null;
3233
private MethodChannel channel;
33-
private boolean v2Plugin;
34-
private boolean v2Attached = false;
35-
36-
private TestLibPlugin(MethodChannel channel) {
37-
this.channel = channel;
3834

39-
v2Plugin = false;
40-
}
35+
public TestLibPlugin() {}
4136

42-
public TestLibPlugin() {
43-
v2Plugin = true;
44-
}
45-
46-
// FlutterPlugin
4737
@Override
48-
public void onAttachedToEngine(FlutterPluginBinding binding) {
49-
if (!v2Plugin) {
50-
return;
51-
}
52-
if (v2Attached) {
53-
return;
54-
}
55-
56-
v2Attached = true;
57-
38+
public void onAttachedToEngine(@NonNull FlutterPluginBinding binding) {
5839
channel = new MethodChannel(binding.getBinaryMessenger(), "com.adjust.test.lib/api");
5940
channel.setMethodCallHandler(this);
6041
}
6142

6243
@Override
63-
public void onDetachedFromEngine(FlutterPluginBinding binding) {
64-
v2Attached = false;
44+
public void onDetachedFromEngine(@NonNull FlutterPluginBinding binding) {
6545
if (channel != null) {
6646
channel.setMethodCallHandler(null);
6747
}
6848
channel = null;
6949
}
7050

71-
// Plugin registration.
72-
public static void registerWith(Registrar registrar) {
73-
final MethodChannel channel = new MethodChannel(registrar.messenger(), "com.adjust.test.lib/api");
74-
channel.setMethodCallHandler(new TestLibPlugin(channel));
75-
}
76-
7751
@Override
7852
public void onMethodCall(MethodCall call, Result result) {
7953
switch (call.method) {

‎test/app/android/app/build.gradle

+16-9
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
plugins {
2+
id "com.android.application"
3+
id "kotlin-android"
4+
id "dev.flutter.flutter-gradle-plugin"
5+
}
6+
17
def localProperties = new Properties()
28
def localPropertiesFile = rootProject.file('local.properties')
39
if (localPropertiesFile.exists()) {
@@ -6,10 +12,10 @@ if (localPropertiesFile.exists()) {
612
}
713
}
814

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-
}
15+
// def flutterRoot = localProperties.getProperty('flutter.sdk')
16+
// if (flutterRoot == null) {
17+
// throw new GradleException("Flutter SDK not found. Define location with flutter.sdk in the local.properties file.")
18+
// }
1319

1420
def flutterVersionCode = localProperties.getProperty('flutter.versionCode')
1521
if (flutterVersionCode == null) {
@@ -21,12 +27,13 @@ if (flutterVersionName == null) {
2127
flutterVersionName = '1.0'
2228
}
2329

24-
apply plugin: 'com.android.application'
25-
apply plugin: 'kotlin-android'
26-
apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
30+
// apply plugin: 'com.android.application'
31+
// apply plugin: 'kotlin-android'
32+
// apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
2733

2834
android {
29-
compileSdkVersion 33
35+
namespace 'com.adjust.app'
36+
compileSdkVersion 35
3037

3138
sourceSets {
3239
main.java.srcDirs += 'src/main/kotlin'
@@ -37,7 +44,7 @@ android {
3744
// TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
3845
applicationId "com.adjust.app"
3946
minSdkVersion flutter.minSdkVersion
40-
targetSdkVersion 32
47+
targetSdkVersion 35
4148
versionCode flutterVersionCode.toInteger()
4249
versionName flutterVersionName
4350
}

‎test/app/android/app/src/debug/AndroidManifest.xml

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
2-
package="com.adjust.app">
1+
<manifest xmlns:android="http://schemas.android.com/apk/res/android">
32
<!-- Flutter needs it to communicate with the running application
43
to allow setting breakpoints, to provide hot reload, etc.
54
-->

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

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
2-
package="com.adjust.app">
1+
<manifest xmlns:android="http://schemas.android.com/apk/res/android">
32
<!-- io.flutter.app.FlutterApplication is an android.app.Application that
43
calls FlutterMain.startInitialization(this); in its onCreate method.
54
In most cases you can leave this as-is, but you if you want to provide

‎test/app/android/app/src/profile/AndroidManifest.xml

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
2-
package="com.adjust.app">
1+
<manifest xmlns:android="http://schemas.android.com/apk/res/android">
32
<!-- Flutter needs it to communicate with the running application
43
to allow setting breakpoints, to provide hot reload, etc.
54
-->

‎test/app/android/build.gradle

+11-11
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
1-
buildscript {
2-
ext.kotlin_version = '1.6.10'
3-
repositories {
4-
google()
5-
mavenCentral()
6-
}
1+
// buildscript {
2+
// ext.kotlin_version = '1.6.10'
3+
// repositories {
4+
// google()
5+
// mavenCentral()
6+
// }
77

8-
dependencies {
9-
classpath 'com.android.tools.build:gradle:7.1.1'
10-
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
11-
}
12-
}
8+
// dependencies {
9+
// classpath 'com.android.tools.build:gradle:7.1.1'
10+
// classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
11+
// }
12+
// }
1313

1414
allprojects {
1515
repositories {

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-all.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip

‎test/app/android/settings.gradle

+31-7
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,35 @@
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+
}()
9+
10+
includeBuild("$flutterSdkPath/packages/flutter_tools/gradle")
11+
12+
repositories {
13+
google()
14+
mavenCentral()
15+
gradlePluginPortal()
16+
}
17+
}
18+
19+
plugins {
20+
id "dev.flutter.flutter-plugin-loader" version "1.0.0"
21+
id "com.android.application" version "8.1.4" apply false
22+
id "org.jetbrains.kotlin.android" version "1.7.10" apply false
23+
}
24+
125
include ':app'
226

3-
def localPropertiesFile = new File(rootProject.projectDir, "local.properties")
4-
def properties = new Properties()
27+
// def localPropertiesFile = new File(rootProject.projectDir, "local.properties")
28+
// def properties = new Properties()
529

6-
assert localPropertiesFile.exists()
7-
localPropertiesFile.withReader("UTF-8") { reader -> properties.load(reader) }
30+
// assert localPropertiesFile.exists()
31+
// localPropertiesFile.withReader("UTF-8") { reader -> properties.load(reader) }
832

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"
33+
// def flutterSdkPath = properties.getProperty("flutter.sdk")
34+
// assert flutterSdkPath != null, "flutter.sdk not set in local.properties"
35+
// apply from: "$flutterSdkPath/packages/flutter_tools/gradle/app_plugin_loader.gradle"

‎test/app/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme

+1
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@
4848
ignoresPersistentStateOnLaunch = "NO"
4949
debugDocumentVersioning = "YES"
5050
debugServiceExtension = "internal"
51+
enableGPUValidationMode = "1"
5152
allowLocationSimulation = "YES">
5253
<BuildableProductRunnable
5354
runnableDebuggingMode = "0">

‎test/app/ios/Runner/AppDelegate.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import UIKit
22
import Flutter
33

4-
@UIApplicationMain
4+
@main
55
@objc class AppDelegate: FlutterAppDelegate {
66
override func application(
77
_ application: UIApplication,

‎test/app/lib/main.dart

+2-2
Original file line numberDiff line numberDiff line change
@@ -26,13 +26,13 @@ class _MyAppState extends State<MyApp> {
2626
super.initState();
2727

2828
if (Platform.isAndroid) {
29-
String _address = '192.168.86.80';
29+
String _address = '192.168.86.151';
3030
String _protocol = 'https';
3131
String _port = '8443';
3232
_overwriteUrl = _protocol + '://' + _address + ':' + _port;
3333
_controlUrl = 'ws://' + _address + ':1987';
3434
} else {
35-
String _address = '192.168.86.80';
35+
String _address = '192.168.86.151';
3636
String _protocol = 'http';
3737
String _port = '8080';
3838
_overwriteUrl = _protocol + '://' + _address + ':' + _port;

‎test/ios/test_lib.podspec

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Pod::Spec.new do |s|
22
s.name = 'test_lib'
3-
s.version = '5.0.2'
3+
s.version = '5.0.3'
44
s.summary = 'Adjust test library for iOS platform'
55
s.description = <<-DESC
66
Adjust test library for iOS platform.

‎test/pubspec.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
name: test_lib
22
description: Flutter plugin for Adjust Testing Library. Intended exclusively for internal use.
3-
version: 5.0.2
3+
version: 5.0.3
44
author: Adjust (sdk@adjust.com)
55

66
environment:

0 commit comments

Comments
 (0)