diff --git a/platform_device_id/android/build.gradle b/platform_device_id/android/build.gradle index 1ab78e3..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.3.50' + ext.kotlin_version = '1.8.0' repositories { google() - jcenter() + // jcenter() + mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:3.5.0' + 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' 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 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)