Skip to content

Commit 284fcf3

Browse files
AbhijeetRanjan308AbhijeetRanjan308
authored
Merge pull request #22 from Kommunicate-io/CM-2427
[CM-2427] Updated the code to support capacitor 7 and Release version 5.0.0
2 parents 3c44d2e + 393a727 commit 284fcf3

File tree

9 files changed

+640
-377
lines changed

9 files changed

+640
-377
lines changed

‎android/build.gradle

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
ext {
2-
junitVersion = project.hasProperty('junitVersion') ? rootProject.ext.junitVersion : '4.12'
3-
androidxJunitVersion = project.hasProperty('androidxJunitVersion') ? rootProject.ext.androidxJunitVersion : '1.1.1'
4-
androidxEspressoCoreVersion = project.hasProperty('androidxEspressoCoreVersion') ? rootProject.ext.androidxEspressoCoreVersion : '3.2.0'
2+
junitVersion = project.hasProperty('junitVersion') ? rootProject.ext.junitVersion : '4.13.2'
3+
androidxJunitVersion = project.hasProperty('androidxJunitVersion') ? rootProject.ext.androidxJunitVersion : '1.1.5'
4+
androidxEspressoCoreVersion = project.hasProperty('androidxEspressoCoreVersion') ? rootProject.ext.androidxEspressoCoreVersion : '3.5.1'
55
}
66

77
buildscript {
@@ -10,29 +10,32 @@ buildscript {
1010
mavenCentral()
1111
}
1212
dependencies {
13-
classpath 'com.android.tools.build:gradle:3.6.1'
13+
classpath 'com.android.tools.build:gradle:8.2.0'
1414
}
1515
}
1616

1717
apply plugin: 'com.android.library'
1818

1919
android {
2020
namespace "io.kommunicate.capacitor.capacitorpluginkommunicate"
21-
compileSdkVersion project.hasProperty('compileSdkVersion') ? rootProject.ext.compileSdkVersion : 30
21+
compileSdkVersion project.hasProperty('compileSdkVersion') ? rootProject.ext.compileSdkVersion : 34
22+
2223
defaultConfig {
23-
minSdkVersion project.hasProperty('minSdkVersion') ? rootProject.ext.minSdkVersion : 21
24-
targetSdkVersion project.hasProperty('targetSdkVersion') ? rootProject.ext.targetSdkVersion : 30
24+
minSdkVersion project.hasProperty('minSdkVersion') ? rootProject.ext.minSdkVersion : 23
25+
targetSdkVersion project.hasProperty('targetSdkVersion') ? rootProject.ext.targetSdkVersion : 34
2526
versionCode 1
2627
versionName "1.0"
2728
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
2829
}
30+
2931
buildTypes {
3032
release {
3133
minifyEnabled false
32-
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
34+
proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
3335
}
3436
}
35-
lintOptions {
37+
38+
lint {
3639
abortOnError false
3740
}
3841
}
@@ -42,15 +45,13 @@ rootProject.allprojects {
4245
google()
4346
mavenCentral()
4447
maven { url 'https://kommunicate.jfrog.io/artifactory/kommunicate-android-sdk' }
45-
4648
}
4749
}
4850

49-
5051
dependencies {
5152
implementation fileTree(dir: 'libs', include: ['*.jar'])
5253
implementation project(':capacitor-android')
53-
api 'io.kommunicate.sdk:kommunicateui:2.12.1'
54+
api 'io.kommunicate.sdk:kommunicateui:2.13.3'
5455
testImplementation "junit:junit:$junitVersion"
5556
androidTestImplementation "androidx.test.ext:junit:$androidxJunitVersion"
5657
androidTestImplementation "androidx.test.espresso:espresso-core:$androidxEspressoCoreVersion"

‎android/src/main/java/io/kommunicate/capacitor/KommunicateCapacitorPlugin.java

Lines changed: 69 additions & 53 deletions
Large diffs are not rendered by default.

‎example/android/app/src/main/java/io/ionic/starter/KmFirebaseService.java

Lines changed: 29 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,29 @@
1-
package io.ionic.starter;
2-
3-
import android.util.Log;
4-
5-
import com.applozic.mobicommons.commons.core.utils.Utils;
6-
import com.getcapacitor.CapacitorFirebaseMessagingService;
7-
import com.google.firebase.messaging.RemoteMessage;
8-
9-
import io.kommunicate.Kommunicate;
10-
11-
public class KmFirebaseService extends CapacitorFirebaseMessagingService {
12-
private static final String TAG = "KmFCMService";
13-
14-
@Override
15-
public void onNewToken(String s) {
16-
Log.w(TAG, "Found deviceToken in KM : " + s);
17-
Kommunicate.updateDeviceToken(this, s);
18-
super.onNewToken(s);
19-
}
20-
21-
@Override
22-
public void onMessageReceived(RemoteMessage remoteMessage) {
23-
Utils.printLog(this, TAG, "Kommunicate notification processing...");
24-
if (Kommunicate.isKmNotification(this, remoteMessage.getData())) {
25-
return;
26-
}
27-
super.onMessageReceived(remoteMessage);
28-
}
29-
}
1+
//package io.ionic.starter;
2+
//
3+
//import android.util.Log;
4+
//
5+
//import com.applozic.mobicommons.commons.core.utils.Utils;
6+
//import com.getcapacitor.CapacitorFirebaseMessagingService;
7+
//import com.google.firebase.messaging.RemoteMessage;
8+
//
9+
//import io.kommunicate.Kommunicate;
10+
//
11+
//public class KmFirebaseService extends CapacitorFirebaseMessagingService {
12+
// private static final String TAG = "KmFCMService";
13+
//
14+
// @Override
15+
// public void onNewToken(String s) {
16+
// Log.w(TAG, "Found deviceToken in KM : " + s);
17+
// Kommunicate.updateDeviceToken(this, s);
18+
// super.onNewToken(s);
19+
// }
20+
//
21+
// @Override
22+
// public void onMessageReceived(RemoteMessage remoteMessage) {
23+
// Utils.printLog(this, TAG, "Kommunicate notification processing...");
24+
// if (Kommunicate.isKmNotification(this, remoteMessage.getData())) {
25+
// return;
26+
// }
27+
// super.onMessageReceived(remoteMessage);
28+
// }
29+
//}

‎example/android/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,15 @@
33
buildscript {
44

55
ext {
6-
agp_version1 = '8.5.2'
6+
agp_version1 = '8.6.0'
77
}
88
repositories {
99
google()
1010
mavenCentral()
1111
}
1212
dependencies {
1313
classpath "com.android.tools.build:gradle:$agp_version1"
14-
classpath 'com.google.gms:google-services:4.3.3'
14+
classpath 'com.google.gms:google-services:4.3.10'
1515

1616
// NOTE: Do not place your application dependencies here; they belong
1717
// in the individual module build.gradle files

‎example/android/variables.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
ext {
22
minSdkVersion = 22
3-
compileSdkVersion = 34
4-
targetSdkVersion = 34
3+
compileSdkVersion = 35
4+
targetSdkVersion = 35
55
androidxAppCompatVersion = '1.2.0'
66
androidxCoordinatorLayoutVersion = '1.1.0'
77
androidxCoreVersion = '1.3.2'

‎example/package-lock.json

Lines changed: 14 additions & 14 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎example/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@
1919
"@angular/platform-browser": "~10.0.0",
2020
"@angular/platform-browser-dynamic": "~10.0.0",
2121
"@angular/router": "~10.0.0",
22-
"@capacitor/android": "^6.0.0",
23-
"@capacitor/core": "^6.0.0",
24-
"@capacitor/ios": "^6.0.0",
22+
"@capacitor/android": "^7.0.0",
23+
"@capacitor/core": "^7.0.0",
24+
"@capacitor/ios": "^7.0.0",
2525
"@ionic-native/core": "^5.0.0",
2626
"@ionic-native/splash-screen": "^5.0.0",
2727
"@ionic-native/status-bar": "^5.0.0",

0 commit comments

Comments
 (0)