From 7c155960c37271c1e15a8bf6b60657d4c3b3dd83 Mon Sep 17 00:00:00 2001 From: ThazinHtun16 Date: Mon, 9 Oct 2023 15:09:54 +0630 Subject: [PATCH 1/9] fix kotlin version --- platform_device_id/android/build.gradle | 2 +- .../example/linux/flutter/generated_plugins.cmake | 8 ++++++++ .../example/windows/flutter/generated_plugin_registrant.h | 2 ++ .../example/windows/flutter/generated_plugins.cmake | 8 ++++++++ .../example/linux/flutter/generated_plugins.cmake | 8 ++++++++ platform_device_id_macos/example/test/widget_test.dart | 2 +- .../example/windows/flutter/generated_plugin_registrant.h | 2 ++ .../example/windows/flutter/generated_plugins.cmake | 8 ++++++++ 8 files changed, 38 insertions(+), 2 deletions(-) diff --git a/platform_device_id/android/build.gradle b/platform_device_id/android/build.gradle index 1ab78e3..d427521 100644 --- a/platform_device_id/android/build.gradle +++ b/platform_device_id/android/build.gradle @@ -2,7 +2,7 @@ group 'com.di1shuai.platform_device_id' version '1.0-SNAPSHOT' buildscript { - ext.kotlin_version = '1.3.50' + // ext.kotlin_version = '1.3.50' repositories { google() jcenter() diff --git a/platform_device_id/example/linux/flutter/generated_plugins.cmake b/platform_device_id/example/linux/flutter/generated_plugins.cmake index 4c3abd8..50ddc85 100644 --- a/platform_device_id/example/linux/flutter/generated_plugins.cmake +++ b/platform_device_id/example/linux/flutter/generated_plugins.cmake @@ -6,6 +6,9 @@ list(APPEND FLUTTER_PLUGIN_LIST platform_device_id_linux ) +list(APPEND FLUTTER_FFI_PLUGIN_LIST +) + set(PLUGIN_BUNDLED_LIBRARIES) foreach(plugin ${FLUTTER_PLUGIN_LIST}) @@ -14,3 +17,8 @@ foreach(plugin ${FLUTTER_PLUGIN_LIST}) list(APPEND PLUGIN_BUNDLED_LIBRARIES $) list(APPEND PLUGIN_BUNDLED_LIBRARIES ${${plugin}_bundled_libraries}) endforeach(plugin) + +foreach(ffi_plugin ${FLUTTER_FFI_PLUGIN_LIST}) + add_subdirectory(flutter/ephemeral/.plugin_symlinks/${ffi_plugin}/linux plugins/${ffi_plugin}) + list(APPEND PLUGIN_BUNDLED_LIBRARIES ${${ffi_plugin}_bundled_libraries}) +endforeach(ffi_plugin) diff --git a/platform_device_id/example/windows/flutter/generated_plugin_registrant.h b/platform_device_id/example/windows/flutter/generated_plugin_registrant.h index 9846246..dc139d8 100644 --- a/platform_device_id/example/windows/flutter/generated_plugin_registrant.h +++ b/platform_device_id/example/windows/flutter/generated_plugin_registrant.h @@ -2,6 +2,8 @@ // Generated file. Do not edit. // +// clang-format off + #ifndef GENERATED_PLUGIN_REGISTRANT_ #define GENERATED_PLUGIN_REGISTRANT_ diff --git a/platform_device_id/example/windows/flutter/generated_plugins.cmake b/platform_device_id/example/windows/flutter/generated_plugins.cmake index 7a26568..839b431 100644 --- a/platform_device_id/example/windows/flutter/generated_plugins.cmake +++ b/platform_device_id/example/windows/flutter/generated_plugins.cmake @@ -6,6 +6,9 @@ list(APPEND FLUTTER_PLUGIN_LIST platform_device_id_windows ) +list(APPEND FLUTTER_FFI_PLUGIN_LIST +) + set(PLUGIN_BUNDLED_LIBRARIES) foreach(plugin ${FLUTTER_PLUGIN_LIST}) @@ -14,3 +17,8 @@ foreach(plugin ${FLUTTER_PLUGIN_LIST}) list(APPEND PLUGIN_BUNDLED_LIBRARIES $) list(APPEND PLUGIN_BUNDLED_LIBRARIES ${${plugin}_bundled_libraries}) endforeach(plugin) + +foreach(ffi_plugin ${FLUTTER_FFI_PLUGIN_LIST}) + add_subdirectory(flutter/ephemeral/.plugin_symlinks/${ffi_plugin}/windows plugins/${ffi_plugin}) + list(APPEND PLUGIN_BUNDLED_LIBRARIES ${${ffi_plugin}_bundled_libraries}) +endforeach(ffi_plugin) diff --git a/platform_device_id_linux/example/linux/flutter/generated_plugins.cmake b/platform_device_id_linux/example/linux/flutter/generated_plugins.cmake index 4c3abd8..50ddc85 100644 --- a/platform_device_id_linux/example/linux/flutter/generated_plugins.cmake +++ b/platform_device_id_linux/example/linux/flutter/generated_plugins.cmake @@ -6,6 +6,9 @@ list(APPEND FLUTTER_PLUGIN_LIST platform_device_id_linux ) +list(APPEND FLUTTER_FFI_PLUGIN_LIST +) + set(PLUGIN_BUNDLED_LIBRARIES) foreach(plugin ${FLUTTER_PLUGIN_LIST}) @@ -14,3 +17,8 @@ foreach(plugin ${FLUTTER_PLUGIN_LIST}) list(APPEND PLUGIN_BUNDLED_LIBRARIES $) list(APPEND PLUGIN_BUNDLED_LIBRARIES ${${plugin}_bundled_libraries}) endforeach(plugin) + +foreach(ffi_plugin ${FLUTTER_FFI_PLUGIN_LIST}) + add_subdirectory(flutter/ephemeral/.plugin_symlinks/${ffi_plugin}/linux plugins/${ffi_plugin}) + list(APPEND PLUGIN_BUNDLED_LIBRARIES ${${ffi_plugin}_bundled_libraries}) +endforeach(ffi_plugin) diff --git a/platform_device_id_macos/example/test/widget_test.dart b/platform_device_id_macos/example/test/widget_test.dart index bc1d70f..299809c 100644 --- a/platform_device_id_macos/example/test/widget_test.dart +++ b/platform_device_id_macos/example/test/widget_test.dart @@ -20,7 +20,7 @@ void main() { find.byWidgetPredicate((Widget widget) => widget is Text && widget.data != null && - widget.data.startsWith('Running on:')), + widget.data!.startsWith('Running on:')), findsOneWidget, ); }); diff --git a/platform_device_id_windows/example/windows/flutter/generated_plugin_registrant.h b/platform_device_id_windows/example/windows/flutter/generated_plugin_registrant.h index 9846246..dc139d8 100644 --- a/platform_device_id_windows/example/windows/flutter/generated_plugin_registrant.h +++ b/platform_device_id_windows/example/windows/flutter/generated_plugin_registrant.h @@ -2,6 +2,8 @@ // Generated file. Do not edit. // +// clang-format off + #ifndef GENERATED_PLUGIN_REGISTRANT_ #define GENERATED_PLUGIN_REGISTRANT_ diff --git a/platform_device_id_windows/example/windows/flutter/generated_plugins.cmake b/platform_device_id_windows/example/windows/flutter/generated_plugins.cmake index 7a26568..839b431 100644 --- a/platform_device_id_windows/example/windows/flutter/generated_plugins.cmake +++ b/platform_device_id_windows/example/windows/flutter/generated_plugins.cmake @@ -6,6 +6,9 @@ list(APPEND FLUTTER_PLUGIN_LIST platform_device_id_windows ) +list(APPEND FLUTTER_FFI_PLUGIN_LIST +) + set(PLUGIN_BUNDLED_LIBRARIES) foreach(plugin ${FLUTTER_PLUGIN_LIST}) @@ -14,3 +17,8 @@ foreach(plugin ${FLUTTER_PLUGIN_LIST}) list(APPEND PLUGIN_BUNDLED_LIBRARIES $) list(APPEND PLUGIN_BUNDLED_LIBRARIES ${${plugin}_bundled_libraries}) endforeach(plugin) + +foreach(ffi_plugin ${FLUTTER_FFI_PLUGIN_LIST}) + add_subdirectory(flutter/ephemeral/.plugin_symlinks/${ffi_plugin}/windows plugins/${ffi_plugin}) + list(APPEND PLUGIN_BUNDLED_LIBRARIES ${${ffi_plugin}_bundled_libraries}) +endforeach(ffi_plugin) From a78d1b3a6e85dfa42d9bdc5cb362735c279294b0 Mon Sep 17 00:00:00 2001 From: ThazinHtun16 Date: Mon, 9 Oct 2023 15:59:10 +0630 Subject: [PATCH 2/9] update kotlin version --- platform_device_id/android/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/platform_device_id/android/build.gradle b/platform_device_id/android/build.gradle index d427521..1108a38 100644 --- a/platform_device_id/android/build.gradle +++ b/platform_device_id/android/build.gradle @@ -2,7 +2,7 @@ group 'com.di1shuai.platform_device_id' version '1.0-SNAPSHOT' buildscript { - // ext.kotlin_version = '1.3.50' + ext.kotlin_version = '1.8.22' repositories { google() jcenter() From 723f865ba54eb1c0720aa2d4ec2817f099235425 Mon Sep 17 00:00:00 2001 From: ThazinHtun16 Date: Mon, 9 Oct 2023 16:16:59 +0630 Subject: [PATCH 3/9] update version --- platform_device_id/android/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/platform_device_id/android/build.gradle b/platform_device_id/android/build.gradle index 1108a38..2082df1 100644 --- a/platform_device_id/android/build.gradle +++ b/platform_device_id/android/build.gradle @@ -2,7 +2,7 @@ group 'com.di1shuai.platform_device_id' version '1.0-SNAPSHOT' buildscript { - ext.kotlin_version = '1.8.22' + ext.kotlin_version = '1.8.0' repositories { google() jcenter() From 00237394388b23dee41cc20a537afa8bec415cd2 Mon Sep 17 00:00:00 2001 From: ThazinHtun16 <125569168+ThazinHtun16@users.noreply.github.com> Date: Mon, 9 Oct 2023 16:44:35 +0630 Subject: [PATCH 4/9] Update build.gradle --- platform_device_id/android/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/platform_device_id/android/build.gradle b/platform_device_id/android/build.gradle index 2082df1..b50750b 100644 --- a/platform_device_id/android/build.gradle +++ b/platform_device_id/android/build.gradle @@ -9,7 +9,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:3.5.0' + classpath 'com.android.tools.build:gradle:7.4.0' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" } } From 03c3c85ec81939761324e91f18cf1be66ec6b80f Mon Sep 17 00:00:00 2001 From: ThazinHtun16 <125569168+ThazinHtun16@users.noreply.github.com> Date: Mon, 9 Oct 2023 16:55:09 +0630 Subject: [PATCH 5/9] Update build.gradle --- platform_device_id/android/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/platform_device_id/android/build.gradle b/platform_device_id/android/build.gradle index b50750b..4b40db4 100644 --- a/platform_device_id/android/build.gradle +++ b/platform_device_id/android/build.gradle @@ -2,14 +2,14 @@ group 'com.di1shuai.platform_device_id' version '1.0-SNAPSHOT' buildscript { - ext.kotlin_version = '1.8.0' + //ext.kotlin_version = '1.8.0' repositories { google() jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:7.4.0' + classpath 'com.android.tools.build:gradle:3.5.0' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" } } From 02cd57b6b6dcb5d80513915b6e58840089197f56 Mon Sep 17 00:00:00 2001 From: ThazinHtun16 <125569168+ThazinHtun16@users.noreply.github.com> Date: Mon, 9 Oct 2023 16:58:10 +0630 Subject: [PATCH 6/9] Update build.gradle --- platform_device_id/android/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/platform_device_id/android/build.gradle b/platform_device_id/android/build.gradle index 4b40db4..b358188 100644 --- a/platform_device_id/android/build.gradle +++ b/platform_device_id/android/build.gradle @@ -9,7 +9,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:3.5.0' + classpath 'com.android.tools.build:gradle:7.5.0' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" } } From 9876e78228e2824904446e7d420c1dc38bd11103 Mon Sep 17 00:00:00 2001 From: ThazinHtun16 <125569168+ThazinHtun16@users.noreply.github.com> Date: Tue, 10 Oct 2023 08:45:36 +0630 Subject: [PATCH 7/9] Update build.gradle --- platform_device_id/android/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/platform_device_id/android/build.gradle b/platform_device_id/android/build.gradle index b358188..f0cc24b 100644 --- a/platform_device_id/android/build.gradle +++ b/platform_device_id/android/build.gradle @@ -9,7 +9,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:7.5.0' + classpath 'com.android.tools.build:gradle:7.3.1' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" } } From 6e6d809bdef97b9dbf0ee759d0e46a92157abde5 Mon Sep 17 00:00:00 2001 From: ThazinHtun16 <125569168+ThazinHtun16@users.noreply.github.com> Date: Tue, 10 Oct 2023 11:06:02 +0630 Subject: [PATCH 8/9] Update build.gradle --- platform_device_id/android/build.gradle | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/platform_device_id/android/build.gradle b/platform_device_id/android/build.gradle index f0cc24b..933edf1 100644 --- a/platform_device_id/android/build.gradle +++ b/platform_device_id/android/build.gradle @@ -2,14 +2,15 @@ group 'com.di1shuai.platform_device_id' version '1.0-SNAPSHOT' buildscript { - //ext.kotlin_version = '1.8.0' + ext.kotlin_version = '1.8.0' repositories { google() - jcenter() + // jcenter() + mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:7.3.1' + classpath 'com.android.tools.build:gradle:7.0.0' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" } } @@ -17,7 +18,8 @@ buildscript { rootProject.allprojects { repositories { google() - jcenter() + // jcenter() + mavenCentral() } } @@ -25,13 +27,13 @@ apply plugin: 'com.android.library' apply plugin: 'kotlin-android' android { - compileSdkVersion 28 + compileSdkVersion 33 sourceSets { main.java.srcDirs += 'src/main/kotlin' } defaultConfig { - minSdkVersion 16 + minSdkVersion 21 } lintOptions { disable 'InvalidPackage' From fe5ad2577da718ed9db5beb88259900b3ee5fc9e Mon Sep 17 00:00:00 2001 From: ThazinHtun16 <125569168+ThazinHtun16@users.noreply.github.com> Date: Tue, 10 Oct 2023 12:02:35 +0630 Subject: [PATCH 9/9] Update gradle-wrapper.properties --- .../android/gradle/wrapper/gradle-wrapper.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/platform_device_id/android/gradle/wrapper/gradle-wrapper.properties b/platform_device_id/android/gradle/wrapper/gradle-wrapper.properties index 01a286e..cb24abd 100644 --- a/platform_device_id/android/gradle/wrapper/gradle-wrapper.properties +++ b/platform_device_id/android/gradle/wrapper/gradle-wrapper.properties @@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.2-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-all.zip