Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat: support for android gradle plugin 8 #117

Merged
merged 9 commits into from
Apr 18, 2024
Merged

feat: support for android gradle plugin 8 #117

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
7a6e4f9
updated package
mrehan27 Apr 9, 2024
68f7f11
updated amiapp
mrehan27 Apr 9, 2024
9bed93b
repo updates
mrehan27 Apr 9, 2024
8c5ea7c
updated to expected version
mrehan27 Apr 9, 2024
965a16e
comment updates
mrehan27 Apr 9, 2024
65361ed
removed unused package
mrehan27 Apr 9, 2024
1052729
registered push service in app
mrehan27 Apr 9, 2024
521a64b
formatted manifest
mrehan27 Apr 9, 2024
2d859be
code comment update
mrehan27 Apr 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 6 additions & 5 deletions android/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ buildscript {
}

dependencies {
classpath 'com.android.tools.build:gradle:7.2.0'
classpath 'com.android.tools.build:gradle:8.3.1'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
}
}
Expand All @@ -26,15 +26,16 @@ apply plugin: 'com.android.library'
apply plugin: 'kotlin-android'

android {
namespace 'io.customer.customer_io'
compileSdkVersion 33

compileOptions {
sourceCompatibility JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_1_8
sourceCompatibility JavaVersion.VERSION_17
targetCompatibility JavaVersion.VERSION_17
}

kotlinOptions {
jvmTarget = '1.8'
jvmTarget = '17'
}

sourceSets {
Expand All @@ -58,7 +59,7 @@ android {
dependencies {
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
// Customer.io SDK
def cioVersion = "3.9.2"
def cioVersion = "3.10.0"
mrehan27 marked this conversation as resolved.
Show resolved Hide resolved
implementation "io.customer.android:tracking:$cioVersion"
implementation "io.customer.android:messaging-push-fcm:$cioVersion"
implementation "io.customer.android:messaging-in-app:$cioVersion"
Expand Down
2 changes: 1 addition & 1 deletion android/gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
2 changes: 1 addition & 1 deletion android/src/main/AndroidManifest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
<manifest package="io.customer.customer_io"></manifest>
<manifest />
1 change: 1 addition & 0 deletions apps/amiapp_flutter/android/app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ plugins {
}

android {
namespace 'io.customer.amiapp_flutter'
compileSdkVersion 33
ndkVersion flutter.ndkVersion

Expand Down
3 changes: 1 addition & 2 deletions apps/amiapp_flutter/android/app/src/main/AndroidManifest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="io.customer.amiapp_flutter">
<manifest xmlns:android="http://schemas.android.com/apk/res/android">

<uses-permission android:name="android.permission.POST_NOTIFICATIONS" />

Expand Down
3 changes: 1 addition & 2 deletions apps/amiapp_flutter/android/app/src/profile/AndroidManifest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="io.customer.amiapp_flutter">
<manifest xmlns:android="http://schemas.android.com/apk/res/android">
<!-- The INTERNET permission is required for development. Specifically,
the Flutter tool needs it to communicate with the running application
to allow setting breakpoints, to provide hot reload, etc.
Expand Down
5 changes: 4 additions & 1 deletion apps/amiapp_flutter/android/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,10 @@ allprojects {
repositories {
google()
mavenCentral()
maven { url 'https://maven.gist.build' }
// For locally deployed builds
mavenLocal()
// For snapshot builds
maven { url 'https://s01.oss.sonatype.org/content/repositories/snapshots/' }
}
}

Expand Down
2 changes: 1 addition & 1 deletion apps/amiapp_flutter/android/gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
2 changes: 1 addition & 1 deletion apps/amiapp_flutter/android/settings.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ pluginManagement {

plugins {
id "dev.flutter.flutter-plugin-loader" version "1.0.0"
id "com.android.application" version "7.2.0" apply false
id "com.android.application" version "8.3.1" apply false
id "org.jetbrains.kotlin.android" version "1.7.21" apply false
id "com.google.gms.google-services" version "4.3.15" apply false
}
Expand Down
Loading