fix: Update Gradle to 8

* update example build.gradle * add missing trailing comma * upgrade AGP to 8 upgrade AGP to 8, upgrade JVM compatibilty to gradle issues, documented changes increase build version to 0.3.1 * upgrade compileSdk to API 34 * make namespace property conditional Co-authored-by: Honza Bittner <git@tenhobi.dev> * use java version 1.8 --------- Co-authored-by: Honza Bittner <git@tenhobi.dev> Co-authored-by: Anton Borries <anton.borries@gmail.com>
KitchenStories · Dec 2, 2023 · e61131d · e61131d
1 parent 58e99a4
commit e61131d
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 7 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,9 @@
+## 0.3.1
+* Fix `renderFlutterWidget` method causing null check exception when trying to save image widget screenshot [#91](https://github.com/ABausG/home_widget/issues/91) by [milindgoel15](https://github.com/milindgoel15)
+* Add support for AGP 8.0 by [milindgoel15](https://github.com/milindgoel15)
+* Upgrade jvm target compatibility to 17 by [milindgoel15](https://github.com/milindgoel15)
+* Upgrade compileSdk to API 34 by [milindgoel15](https://github.com/milindgoel15)
+
 ## 0.3.0
 * Add `renderFlutterWidget` method to save a Flutter Widget as an Image [#126](https://github.com/ABausG/home_widget/pull/126) by [leighajarett](https://github.com/leighajarett)
 

diff --git a/android/build.gradle b/android/build.gradle
@@ -2,14 +2,14 @@ group 'es.antonborri.home_widget'
 version '1.0-SNAPSHOT'
 
 buildscript {
-    ext.kotlin_version = '1.8.0'
+    ext.kotlin_version = '1.9.0'
     repositories {
         google()
         mavenCentral()
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.4.2'
+        classpath 'com.android.tools.build:gradle:8.1.2'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
     }
 }
@@ -25,7 +25,11 @@ apply plugin: 'com.android.library'
 apply plugin: 'kotlin-android'
 
 android {
-    compileSdkVersion 33
+    // Conditional for compatibility with AGP <4.2.
+    if (project.android.hasProperty("namespace")) {
+        namespace 'es.antonborri.home_widget'
+    }
+    compileSdk 34
 
     sourceSets {
         main.java.srcDirs += 'src/main/kotlin'
@@ -36,6 +40,13 @@ android {
     lintOptions {
         disable 'InvalidPackage'
     }
+    compileOptions {
+        targetCompatibility JavaVersion.VERSION_1_8
+        sourceCompatibility JavaVersion.VERSION_1_8
+    }
+    kotlinOptions {
+        jvmTarget = "1.8"
+    }
 }
 
 dependencies {

diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,6 @@
+#Fri Oct 13 13:45:37 IST 2023
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-all.zip
diff --git a/example/android/app/build.gradle b/example/android/app/build.gradle
@@ -8,7 +8,7 @@ if (localPropertiesFile.exists()) {
 
 def flutterRoot = localProperties.getProperty('flutter.sdk')
 if (flutterRoot == null) {
-    throw new GradleException("Flutter SDK not found. Define location with flutter.sdk in the local.properties file.")
+    throw new FileNotFoundException("Flutter SDK not found. Define location with flutter.sdk in the local.properties file.")
 }
 
 def flutterVersionCode = localProperties.getProperty('flutter.versionCode')
@@ -39,7 +39,7 @@ android {
     defaultConfig {
         // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
         applicationId "es.antonborri.home_widget_example"
-        minSdkVersion 16
+        minSdkVersion 19
         targetSdkVersion 33
         versionCode flutterVersionCode.toInteger()
         versionName flutterVersionName

diff --git a/pubspec.yaml b/pubspec.yaml
@@ -1,6 +1,6 @@
 name: home_widget
 description: A plugin to provide a common interface for creating HomeScreen Widgets for Android and iOS.
-version: 0.3.0
+version: 0.3.1
 repository: https://github.com/ABausG/home_widget
 
 environment: