Support AGP 8 (#387)

v3rm0n · Nov 30, 2023 · 6cd517b · 6cd517b
1 parent 7656e0f
commit 6cd517b
Show file tree

Hide file tree

Showing 10 changed files with 36 additions and 17 deletions.
diff --git a/intercom_flutter/.gitignore b/intercom_flutter/.gitignore
@@ -6,7 +6,8 @@
 pubspec.lock
 
 build/
-.idea/
+.idea/*
+!.idea/runConfigurations
 android/bin/
 example/.flutter-plugins-dependencies
 example/ios/Flutter/flutter_export_environment.sh
diff --git a/intercom_flutter/CHANGELOG.md b/intercom_flutter/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changelog
 
+## 8.0.7
+
+* Added support of AGP 8.
+
 ## 8.0.6
 
 * Bump `intercom_flutter_web` to `1.0.1` to support `uuid: ^4.2.1`.

diff --git a/intercom_flutter/android/.gitignore b/intercom_flutter/android/.gitignore
@@ -1,8 +1,7 @@
 *.iml
 .gradle
 /local.properties
-/.idea/workspace.xml
-/.idea/libraries
+/.idea/*
 .DS_Store
 /build
 /captures
diff --git a/intercom_flutter/android/build.gradle b/intercom_flutter/android/build.gradle
@@ -2,14 +2,14 @@ group 'io.maido.intercom'
 version '1.0-SNAPSHOT'
 
 buildscript {
-    ext.kotlin_version = '1.7.20'
+    ext.kotlin_version = '1.9.21'
     repositories {
         google()
         mavenCentral()
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.3.1'
+        classpath 'com.android.tools.build:gradle:8.1.4'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
     }
 }
@@ -25,12 +25,12 @@ apply plugin: 'com.android.library'
 apply plugin: 'kotlin-android'
 
 android {
-    compileSdkVersion 34
+    compileSdk 34
     sourceSets {
         main.java.srcDirs += 'src/main/kotlin'
     }
     defaultConfig {
-        minSdkVersion 21
+        minSdk 21
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
     lintOptions {
@@ -39,10 +39,17 @@ android {
     if (project.android.hasProperty('namespace')) {
         namespace 'io.maido.intercom'
     }
+    compileOptions {
+      sourceCompatibility JavaVersion.VERSION_1_8
+      targetCompatibility JavaVersion.VERSION_1_8
+    }
+    kotlinOptions {
+      jvmTarget = '1.8'
+    }
 }
 
 dependencies {
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
+    implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
     implementation 'io.intercom.android:intercom-sdk:15.5.0'
-    implementation 'com.google.firebase:firebase-messaging:23.1.2'
+    implementation 'com.google.firebase:firebase-messaging:23.3.1'
 }
diff --git a/intercom_flutter/android/gradle/wrapper/gradle-wrapper.properties b/intercom_flutter/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-7.6-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
diff --git a/intercom_flutter/example/android/.gitignore b/intercom_flutter/example/android/.gitignore
@@ -2,8 +2,7 @@
 *.class
 .gradle
 /local.properties
-/.idea/workspace.xml
-/.idea/libraries
+/.idea/*
 .DS_Store
 /build
 /captures

diff --git a/intercom_flutter/example/android/app/build.gradle b/intercom_flutter/example/android/app/build.gradle
@@ -52,12 +52,21 @@ android {
             signingConfig signingConfigs.debug
         }
     }
+
+    compileOptions {
+      sourceCompatibility JavaVersion.VERSION_1_8
+      targetCompatibility JavaVersion.VERSION_1_8
+    }
+
+    kotlinOptions {
+      jvmTarget = '1.8'
+    }
 }
 
 flutter {
     source '../..'
 }
 
 dependencies {
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
+    implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
 }
diff --git a/intercom_flutter/example/android/build.gradle b/intercom_flutter/example/android/build.gradle
@@ -1,12 +1,12 @@
 buildscript {
-    ext.kotlin_version = '1.9.0'
+    ext.kotlin_version = '1.9.21'
     repositories {
         google()
         mavenCentral()
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.3.1'
+        classpath 'com.android.tools.build:gradle:8.1.4'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
     }
 }

diff --git a/intercom_flutter/example/android/gradle/wrapper/gradle-wrapper.properties b/intercom_flutter/example/android/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 #Thu Jun 17 14:27:11 IST 2021
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
diff --git a/intercom_flutter/pubspec.yaml b/intercom_flutter/pubspec.yaml
@@ -1,7 +1,7 @@
 name: intercom_flutter
 description: Flutter plugin for Intercom integration. Provides in-app messaging
   and help-center Intercom services
-version: 8.0.6
+version: 8.0.7
 homepage: https://github.com/v3rm0n/intercom_flutter
 
 dependencies: