From a0f37756ff4e31b3462c31fb584ac726aa6b245e Mon Sep 17 00:00:00 2001 From: Deepak Goyal Date: Thu, 28 Nov 2024 02:33:09 +0530 Subject: [PATCH] Update intercom-android 15.11.2 (#487) --- intercom_flutter/CHANGELOG.md | 4 + intercom_flutter/README.md | 2 +- intercom_flutter/android/build.gradle | 2 +- .../example/android/app/build.gradle | 86 +++++++++---------- intercom_flutter/example/android/build.gradle | 13 --- .../gradle/wrapper/gradle-wrapper.properties | 2 +- .../example/android/settings.gradle | 32 ++++--- intercom_flutter/pubspec.yaml | 2 +- 8 files changed, 70 insertions(+), 73 deletions(-) diff --git a/intercom_flutter/CHANGELOG.md b/intercom_flutter/CHANGELOG.md index 823bea51..b0ac5c34 100755 --- a/intercom_flutter/CHANGELOG.md +++ b/intercom_flutter/CHANGELOG.md @@ -1,5 +1,9 @@ # Changelog +## 9.2.1 + +* Bump Intercom Android SDK version to 15.11.2 + ## 9.2.0 * Bump Intercom Android SDK version to 15.11.1 diff --git a/intercom_flutter/README.md b/intercom_flutter/README.md index b3425ece..aad4a30f 100755 --- a/intercom_flutter/README.md +++ b/intercom_flutter/README.md @@ -5,7 +5,7 @@ Flutter wrapper for Intercom [Android](https://github.com/intercom/intercom-android), [iOS](https://github.com/intercom/intercom-ios), and [Web](https://developers.intercom.com/installing-intercom/docs/basic-javascript) projects. -- Uses Intercom Android SDK Version `15.11.1`. +- Uses Intercom Android SDK Version `15.11.2`. - The minimum Android SDK `minSdk` required is 21. - The compile Android SDK `compileSdk` required is 34. - Uses Intercom iOS SDK Version `18.2.0`. diff --git a/intercom_flutter/android/build.gradle b/intercom_flutter/android/build.gradle index fced3645..d4cde47b 100644 --- a/intercom_flutter/android/build.gradle +++ b/intercom_flutter/android/build.gradle @@ -50,6 +50,6 @@ android { dependencies { implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" - implementation 'io.intercom.android:intercom-sdk:15.11.1' + implementation 'io.intercom.android:intercom-sdk:15.11.2' implementation 'com.google.firebase:firebase-messaging:23.3.1' } diff --git a/intercom_flutter/example/android/app/build.gradle b/intercom_flutter/example/android/app/build.gradle index 8163c5d3..8f5551df 100644 --- a/intercom_flutter/example/android/app/build.gradle +++ b/intercom_flutter/example/android/app/build.gradle @@ -1,72 +1,66 @@ +plugins { + id "com.android.application" + id "kotlin-android" + id "dev.flutter.flutter-gradle-plugin" +} + def localProperties = new Properties() def localPropertiesFile = rootProject.file('local.properties') if (localPropertiesFile.exists()) { - localPropertiesFile.withReader('UTF-8') { reader -> - localProperties.load(reader) - } -} - -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.") + localPropertiesFile.withReader('UTF-8') { reader -> + localProperties.load(reader) + } } def flutterVersionCode = localProperties.getProperty('flutter.versionCode') if (flutterVersionCode == null) { - flutterVersionCode = '1' + flutterVersionCode = '1' } def flutterVersionName = localProperties.getProperty('flutter.versionName') if (flutterVersionName == null) { - flutterVersionName = '1.0' + flutterVersionName = '1.0' } -apply plugin: 'com.android.application' -apply plugin: 'kotlin-android' -apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle" - android { - compileSdk 34 + compileSdk 34 - namespace 'io.maido.intercomexample' + namespace 'io.maido.intercomexample' - sourceSets { - main.java.srcDirs += 'src/main/kotlin' - } + sourceSets { + main.java.srcDirs += 'src/main/kotlin' + } - lintOptions { - disable 'InvalidPackage' - } - defaultConfig { - applicationId "io.maido.intercomexample" - minSdk 21 - targetSdk 34 - versionCode flutterVersionCode.toInteger() - versionName flutterVersionName - testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" - } + defaultConfig { + applicationId "io.maido.intercomexample" + minSdk 21 + targetSdk 34 + versionCode flutterVersionCode.toInteger() + versionName flutterVersionName + testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" + } - buildTypes { - release { - signingConfig signingConfigs.debug - } + buildTypes { + release { + signingConfig signingConfigs.debug } + } - compileOptions { - sourceCompatibility JavaVersion.VERSION_1_8 - targetCompatibility JavaVersion.VERSION_1_8 - } + compileOptions { + sourceCompatibility JavaVersion.VERSION_1_8 + targetCompatibility JavaVersion.VERSION_1_8 + } - kotlinOptions { - jvmTarget = '1.8' - } -} + kotlinOptions { + jvmTarget = '1.8' + } -flutter { - source '../..' + lint { + disable 'InvalidPackage' + } } -dependencies { - implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" +flutter { + source '../..' } diff --git a/intercom_flutter/example/android/build.gradle b/intercom_flutter/example/android/build.gradle index e4643a1d..3b4a3384 100644 --- a/intercom_flutter/example/android/build.gradle +++ b/intercom_flutter/example/android/build.gradle @@ -1,16 +1,3 @@ -buildscript { - ext.kotlin_version = '1.9.21' - repositories { - google() - mavenCentral() - } - - dependencies { - classpath 'com.android.tools.build:gradle:8.1.4' - classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" - } -} - rootProject.allprojects { repositories { google() diff --git a/intercom_flutter/example/android/gradle/wrapper/gradle-wrapper.properties b/intercom_flutter/example/android/gradle/wrapper/gradle-wrapper.properties index 1dfd0fe9..2979bb67 100644 --- 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-8.5-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip distributionPath=wrapper/dists zipStorePath=wrapper/dists zipStoreBase=GRADLE_USER_HOME diff --git a/intercom_flutter/example/android/settings.gradle b/intercom_flutter/example/android/settings.gradle index 5a2f14fb..71227cc8 100644 --- a/intercom_flutter/example/android/settings.gradle +++ b/intercom_flutter/example/android/settings.gradle @@ -1,15 +1,27 @@ -include ':app' +pluginManagement { + def flutterSdkPath = { + def properties = new Properties() + file("local.properties").withInputStream { properties.load(it) } + def flutterSdkPath = properties.getProperty("flutter.sdk") + assert flutterSdkPath != null, "flutter.sdk not set in local.properties" + return flutterSdkPath + } + settings.ext.flutterSdkPath = flutterSdkPath() -def flutterProjectRoot = rootProject.projectDir.parentFile.toPath() + includeBuild("${settings.ext.flutterSdkPath}/packages/flutter_tools/gradle") -def plugins = new Properties() -def pluginsFile = new File(flutterProjectRoot.toFile(), '.flutter-plugins') -if (pluginsFile.exists()) { - pluginsFile.withReader('UTF-8') { reader -> plugins.load(reader) } + repositories { + google() + mavenCentral() + gradlePluginPortal() + } } -plugins.each { name, path -> - def pluginDirectory = flutterProjectRoot.resolve(path).resolve('android').toFile() - include ":$name" - project(":$name").projectDir = pluginDirectory +plugins { + id "dev.flutter.flutter-plugin-loader" version "1.0.0" + id "com.android.application" version '8.7.2' apply false + id "org.jetbrains.kotlin.android" version "1.9.21" apply false + id "com.google.gms.google-services" version "4.4.2" apply false } + +include ":app" diff --git a/intercom_flutter/pubspec.yaml b/intercom_flutter/pubspec.yaml index 5eddce5c..1af397be 100644 --- 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: 9.2.0 +version: 9.2.1 homepage: https://github.com/v3rm0n/intercom_flutter dependencies: