diff --git a/CHANGELOG.md b/CHANGELOG.md index 65a1602..cfa17d7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,7 @@ +## 0.3.0 + +* Upgrade to AGP 8.1.0 (migrate namespace to build.gradle) + ## 0.2.0 * Finish flutter embedding v2 migration. #17 diff --git a/android/build.gradle b/android/build.gradle index 4c7c7b9..dbb4cf0 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -4,25 +4,26 @@ version '1.0' buildscript { repositories { google() - jcenter() + mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:3.2.1' + classpath 'com.android.tools.build:gradle:8.1.0' } } rootProject.allprojects { repositories { google() - jcenter() + mavenCentral() } } apply plugin: 'com.android.library' android { - compileSdkVersion 28 + namespace "io.adaptant.labs.flutter_windowmanager" + compileSdk 31 defaultConfig { minSdkVersion 16 diff --git a/android/src/main/AndroidManifest.xml b/android/src/main/AndroidManifest.xml index 07f0c40..a2f47b6 100644 --- a/android/src/main/AndroidManifest.xml +++ b/android/src/main/AndroidManifest.xml @@ -1,3 +1,2 @@ - + diff --git a/example/android/app/build.gradle b/example/android/app/build.gradle index bbc428e..71d7fb7 100644 --- a/example/android/app/build.gradle +++ b/example/android/app/build.gradle @@ -25,7 +25,8 @@ apply plugin: 'com.android.application' apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle" android { - compileSdkVersion 28 + namespace "io.adaptant.labs.flutter_windowmanager_example" + compileSdk 31 lintOptions { disable 'InvalidPackage' @@ -35,7 +36,7 @@ android { // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html). applicationId "io.adaptant.labs.flutter_windowmanager_example" minSdkVersion 16 - targetSdkVersion 28 + targetSdk 31 versionCode flutterVersionCode.toInteger() versionName flutterVersionName testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" diff --git a/example/android/app/src/main/AndroidManifest.xml b/example/android/app/src/main/AndroidManifest.xml index ba3a1b8..fa14499 100644 --- a/example/android/app/src/main/AndroidManifest.xml +++ b/example/android/app/src/main/AndroidManifest.xml @@ -1,5 +1,4 @@ - + @@ -12,7 +11,8 @@ android:theme="@style/LaunchTheme" android:configChanges="orientation|keyboardHidden|keyboard|screenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode" android:hardwareAccelerated="true" - android:windowSoftInputMode="adjustResize"> + android:windowSoftInputMode="adjustResize" + android:exported="true"> diff --git a/example/android/build.gradle b/example/android/build.gradle index bb8a303..8ce0f1d 100644 --- a/example/android/build.gradle +++ b/example/android/build.gradle @@ -1,18 +1,18 @@ buildscript { repositories { google() - jcenter() + mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:3.2.1' + classpath 'com.android.tools.build:gradle:8.1.0' } } allprojects { repositories { google() - jcenter() + mavenCentral() } } @@ -24,6 +24,6 @@ subprojects { project.evaluationDependsOn(':app') } -task clean(type: Delete) { +tasks.register("clean", Delete) { delete rootProject.buildDir } diff --git a/example/android/gradle/wrapper/gradle-wrapper.properties b/example/android/gradle/wrapper/gradle-wrapper.properties index 2819f02..89e56bd 100644 --- a/example/android/gradle/wrapper/gradle-wrapper.properties +++ b/example/android/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.2-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-all.zip diff --git a/example/pubspec.yaml b/example/pubspec.yaml index 000cb1e..0d49ff8 100644 --- a/example/pubspec.yaml +++ b/example/pubspec.yaml @@ -3,7 +3,7 @@ description: Demonstrates how to use the flutter_windowmanager plugin. publish_to: 'none' environment: - sdk: ">=2.1.0 <3.0.0" + sdk: ">=2.12.0 <3.0.0" dependencies: flutter: diff --git a/example/test/widget_test.dart b/example/test/widget_test.dart index 7dbe875..70a41e7 100644 --- a/example/test/widget_test.dart +++ b/example/test/widget_test.dart @@ -19,7 +19,7 @@ void main() { expect( find.byWidgetPredicate( (Widget widget) => - widget is Text && widget.data.startsWith('Secure Mode:'), + widget is Text && widget.data!.startsWith('Secure Mode:'), ), findsOneWidget, ); diff --git a/pubspec.yaml b/pubspec.yaml index 9d9be72..532c0c8 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -1,6 +1,6 @@ name: flutter_windowmanager description: A Flutter plugin for manipulating Android WindowManager LayoutParams. -version: 0.2.0 +version: 0.3.0 homepage: https://github.com/adaptant-labs/flutter_windowmanager repository: https://github.com/adaptant-labs/flutter_windowmanager issue_tracker: https://github.com/adaptant-labs/flutter_windowmanager/issues