Merge branch 'master' into master

DavBfr · Aug 9, 2024 · aed12cc · aed12cc
2 parents b042504 + 4146df6
commit aed12cc
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 13 deletions.
diff --git a/pdf/CHANGELOG.md b/pdf/CHANGELOG.md
@@ -3,6 +3,7 @@
 ## 3.11.1
 
 - Fixed display problems with textfields [ilaurillard]
+- Tighten dependencies
 
 ## 3.11.0
 

diff --git a/printing/CHANGELOG.md b/printing/CHANGELOG.md
@@ -6,6 +6,8 @@
 - Workaround for iOS bug and force paper size [Matteo Ricupero]
 - Update package:web [Sabin Neupane]
 - Force the latest version of pdf_widget_wrapper
+- Tighten dependencies
+- Update Android build settings
 
 ## 5.13.1
 

diff --git a/printing/android/build.gradle b/printing/android/build.gradle
@@ -1,5 +1,5 @@
-group 'net.nfet.flutter.printing'
-version '1.0'
+group "net.nfet.flutter.printing"
+version "1.0"
 
 buildscript {
     repositories {
@@ -8,7 +8,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.1.0'
+        classpath "com.android.tools.build:gradle:7.3.0"
     }
 }
 
@@ -19,24 +19,25 @@ rootProject.allprojects {
     }
 }
 
-apply plugin: 'com.android.library'
+apply plugin: "com.android.library"
 
 android {
-    // Conditional for compatibility with AGP <4.2.
     if (project.android.hasProperty("namespace")) {
-      namespace 'net.nfet.flutter.printing'
+        namespace = "net.nfet.flutter.printing"
     }
-    compileSdkVersion 30
+
+    compileSdk = 34
 
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
+        sourceCompatibility = JavaVersion.VERSION_1_8
+        targetCompatibility = JavaVersion.VERSION_1_8
     }
 
     defaultConfig {
-        minSdkVersion 16
+        minSdk = 21
     }
+
     lintOptions {
-        disable 'InvalidPackage'
+        disable "InvalidPackage"
     }
 }
diff --git a/printing/pubspec.yaml b/printing/pubspec.yaml
@@ -28,7 +28,7 @@ dependencies:
   flutter_web_plugins:
     sdk: flutter
   http: ">=0.13.0 <2.0.0"
-  image: ^4.0.02
+  image: ^4.1.0
   meta: ">=1.3.0 <2.0.0"
   pdf: ^3.10.0
   pdf_widget_wrapper: '>=1.0.4 <2.0.0'
@@ -39,7 +39,7 @@ dev_dependencies:
   flutter_lints: ^4.0.0
   flutter_test:
     sdk: flutter
-  mockito: ^5.3.2
+  mockito: ^5.4.4
 
 dependency_overrides:
   pdf: