Skip to content

Commit 97ada7c

Browse files
committed
AGP 7 checks for existence of exported flag
Fixed the unittest so they build as the AGP plugin now checks for android:exported flags activity, receiver, and etc. This included adding them to our own test `AndroidManifest.xml` as well as updating libraries which did have them.
1 parent fca54fa commit 97ada7c

File tree

5 files changed

+13
-8
lines changed

5 files changed

+13
-8
lines changed

Examples/OneSignalDemo/app/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ dependencies {
7777
exclude group: 'com.google.firebase', module: 'firebase-messaging'
7878
}
7979
// Add HMS Push library
80-
huaweiImplementation 'com.huawei.hms:push:5.3.0.304'
80+
huaweiImplementation 'com.huawei.hms:push:6.1.0.300'
8181
// Optionally add HMS location
8282
huaweiImplementation 'com.huawei.hms:location:4.0.0.300'
8383
/** END - Huawei Builds **/

Examples/OneSignalDemo/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ buildscript {
1212
classpath 'com.android.tools.build:gradle:7.0.4'
1313
classpath 'com.google.gms:google-services:4.3.10'
1414
classpath 'gradle.plugin.com.onesignal:onesignal-gradle-plugin:[0.14.0, 0.99.99]'
15-
classpath 'com.huawei.agconnect:agcp:1.2.1.301'
15+
classpath 'com.huawei.agconnect:agcp:1.6.2.300'
1616

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

OneSignalSDK/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ buildscript {
99
]
1010
androidGradlePluginVersion = '7.0.4'
1111
googleServicesGradlePluginVersion = '4.3.10'
12-
huaweiAgconnectVersion = '1.2.1.301'
13-
huaweiHMSPushVersion = '5.3.0.304'
12+
huaweiAgconnectVersion = '1.6.2.300'
13+
huaweiHMSPushVersion = '6.1.0.300'
1414
huaweiHMSLocationVersion = '4.0.0.300'
1515
kotlinVersion = '1.4.32'
1616
onesignalGradlePluginVersion = '[0.14.0, 0.99.99]'

OneSignalSDK/unittest/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@ ext {
55
versionName: '1.0'
66
]
77
androidTestCoreVersion = '1.3.0'
8-
androidWorkTestVersion = '2.5.0'
8+
androidWorkTestVersion = '2.7.1'
99
awaitilityVersion = '3.1.5'
1010
firebaseAnalytics = '19.0.1'
11-
googlePlayServicesVersion = '17.0.0'
11+
googlePlayServicesVersion = '18.0.0'
1212
jUnitVersion = '4.13.2'
1313
reflectionsVersion = '0.9.12'
1414
roboelectricVersion = '4.4'

OneSignalSDK/unittest/src/main/AndroidManifest.xml

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,14 @@
66
<uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION"/>
77

88
<application>
9-
<activity android:name=".MainActivity" />
9+
<activity
10+
android:name=".MainActivity"
11+
android:exported="true"
12+
/>
1013

11-
<activity android:name=".BlankActivity">
14+
<activity
15+
android:name=".BlankActivity"
16+
android:exported="true">
1217
<intent-filter>
1318
<action android:name="android.intent.action.MAIN" />
1419
<category android:name="android.intent.category.LAUNCHER" />

0 commit comments

Comments
 (0)