Skip to content

Commit 88d4d9a

Browse files
stonebuzzstonebuzz
committed
feat(core): bump SdkVersion to 33
1 parent fefd991 commit 88d4d9a

File tree

5 files changed

+82
-129
lines changed

5 files changed

+82
-129
lines changed

‎app/build.gradle

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,13 @@ apply plugin: 'com.android.application'
22
apply plugin: 'com.google.firebase.crashlytics'
33

44
android {
5-
compileSdkVersion 30
6-
buildToolsVersion '29.0.3'
5+
compileSdkVersion 33
76
useLibrary 'org.apache.http.legacy'
87

98
defaultConfig {
109
applicationId "org.glpi.inventory.agent"
11-
minSdkVersion 18
12-
targetSdkVersion 30
10+
minSdkVersion 19
11+
targetSdkVersion 33
1312
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
1413
}
1514

@@ -34,7 +33,8 @@ android {
3433
maxProcessCount 8
3534
}
3635

37-
lintOptions {
36+
namespace 'org.glpi.inventory.agent'
37+
lint {
3838
abortOnError false
3939
}
4040

@@ -47,11 +47,11 @@ dependencies {
4747
implementation fileTree(include: ['*.jar', '*.aar'], dir: 'libs')
4848
implementation 'info.hoang8f:fbutton:1.0.5'
4949

50-
implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
50+
implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
5151

52-
androidTestImplementation 'androidx.test.ext:junit:1.1.2'
53-
androidTestImplementation 'androidx.test:rules:1.3.0'
54-
androidTestImplementation 'androidx.test:runner:1.3.0'
52+
androidTestImplementation 'androidx.test.ext:junit:1.1.5'
53+
androidTestImplementation 'androidx.test:rules:1.5.0'
54+
androidTestImplementation 'androidx.test:runner:1.5.2'
5555

5656
androidTestImplementation('androidx.test.espresso:espresso-core:3.1.0', {
5757
exclude group: 'com.androidx', module: 'support-annotations'
@@ -63,22 +63,22 @@ dependencies {
6363
testImplementation 'org.mockito:mockito-core:2.21.0'
6464
androidTestImplementation 'org.mockito:mockito-android:2.21.0'
6565

66-
implementation 'androidx.test.espresso:espresso-idling-resource:3.3.0'
66+
implementation 'androidx.test.espresso:espresso-idling-resource:3.5.1'
6767
implementation fileTree(dir: 'libs', include: ['*.jar'])
6868
implementation 'androidx.legacy:legacy-support-v4:1.0.0'
69-
implementation 'androidx.appcompat:appcompat:1.2.0'
70-
implementation 'com.google.android.material:material:1.3.0'
69+
implementation 'androidx.appcompat:appcompat:1.6.1'
70+
implementation 'com.google.android.material:material:1.9.0'
7171
implementation 'com.orhanobut:logger:2.2.0'
7272
implementation 'androidx.multidex:multidex:2.0.1'
73-
implementation 'androidx.preference:preference:1.1.1'
73+
implementation 'androidx.preference:preference:1.2.1'
7474
implementation 'org.dom4j:dom4j:2.1.3'
7575

7676

7777
// Add the Firebase Crashlytics SDK.
78-
implementation 'com.google.firebase:firebase-crashlytics:17.4.0'
78+
implementation 'com.google.firebase:firebase-crashlytics:18.4.1'
7979

8080
// Recommended: Add the Google Analytics SDK.
81-
implementation 'com.google.firebase:firebase-analytics:18.0.2'
81+
implementation 'com.google.firebase:firebase-analytics:21.3.0'
8282

8383

8484
implementation 'com.google.zxing:core:3.3.0'
@@ -183,4 +183,4 @@ task updateVersionName {
183183
}
184184
}
185185

186-
apply plugin: 'com.google.gms.google-services'
186+
apply plugin: 'com.google.gms.google-services'

‎app/src/main/AndroidManifest.xml

Lines changed: 60 additions & 104 deletions
Original file line numberDiff line numberDiff line change
@@ -1,140 +1,96 @@
1-
<?xml version="1.0" encoding="utf-8"?>
2-
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
3-
xmlns:tools="http://schemas.android.com/tools"
4-
package="org.glpi.inventory.agent"
5-
android:versionCode="39351"
6-
android:versionName="">
1+
<?xml version="1.0" encoding="utf-8"?><manifest xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools" android:versionCode="39351" android:versionName="">
72

83
<!-- Permissions -->
9-
<uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
10-
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
11-
<uses-permission android:name="android.permission.ACCESS_MOCK_LOCATION" />
12-
<uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
13-
<uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
14-
<uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
15-
<uses-permission android:name="android.permission.ACCESS_LOCATION_EXTRA_COMMANDS" />
16-
<uses-permission android:name="android.permission.READ_PHONE_STATE" />
17-
<uses-permission android:name="android.permission.INTERNET" />
18-
<uses-permission android:name="android.permission.CAMERA" />
19-
<uses-permission android:name="android.permission.BLUETOOTH" />
20-
<uses-permission android:name="android.permission.GET_PACKAGE_SIZE" />
21-
<uses-permission android:name="android.permission.CHANGE_WIFI_MULTICAST_STATE" />
22-
<uses-permission android:name="android.permission.CHANGE_WIFI_STATE" />
4+
<uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/>
5+
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
6+
<uses-permission android:name="android.permission.ACCESS_MOCK_LOCATION"/>
7+
<uses-permission android:name="android.permission.ACCESS_WIFI_STATE"/>
8+
<uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION"/>
9+
<uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"/>
10+
<uses-permission android:name="android.permission.ACCESS_LOCATION_EXTRA_COMMANDS"/>
11+
<uses-permission android:name="android.permission.READ_PHONE_STATE"/>
12+
<uses-permission android:name="android.permission.INTERNET"/>
13+
<uses-permission android:name="android.permission.CAMERA"/>
14+
<uses-permission android:name="android.permission.BLUETOOTH"/>
15+
<uses-permission android:name="android.permission.GET_PACKAGE_SIZE"/>
16+
<uses-permission android:name="android.permission.CHANGE_WIFI_MULTICAST_STATE"/>
17+
<uses-permission android:name="android.permission.CHANGE_WIFI_STATE"/>
2318
<!-- Allows unlocking your device and activating its screen so UI tests can succeed -->
24-
<uses-permission android:name="android.permission.DISABLE_KEYGUARD" />
25-
<uses-permission android:name="android.permission.WAKE_LOCK" />
19+
<uses-permission android:name="android.permission.DISABLE_KEYGUARD"/>
20+
<uses-permission android:name="android.permission.WAKE_LOCK"/>
2621

2722
<!-- Allows for QR COde scanner -->
28-
<uses-permission android:name="android.permission.VIBRATE" />
23+
<uses-permission android:name="android.permission.VIBRATE"/>
2924

3025
<!-- Allows for storing and retrieving screenshots -->
31-
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
32-
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
26+
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
27+
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
3328

3429
<!-- Allows changing locales -->
35-
<uses-permission android:name="android.permission.CHANGE_CONFIGURATION" />
30+
<uses-permission android:name="android.permission.CHANGE_CONFIGURATION"/>
3631

3732
<!-- Apps wanting to use foreground services, API 28 higher -->
38-
<uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
39-
40-
<application
41-
android:name="org.glpi.inventory.agent.ui.InventoryAgentApp"
42-
android:icon="@mipmap/ic_launcher"
43-
android:roundIcon="@drawable/ic_launcher_round"
44-
android:label="@string/app_name"
45-
android:theme="@style/AppTheme"
46-
android:largeHeap="true"
47-
android:vmSafeMode="true"
48-
android:requestLegacyExternalStorage="true">
49-
50-
<uses-library android:name="org.apache.http.legacy" android:required="false" />
51-
52-
<meta-data
53-
android:name="firebase_crashlytics_collection_enabled"
54-
android:value="${crashlyticsEnabled}" />
55-
56-
<activity
57-
android:name="org.glpi.inventory.agent.ui.ActivitySplash"
58-
android:theme="@style/NoActionBar">
33+
<uses-permission android:name="android.permission.FOREGROUND_SERVICE"/>
34+
35+
<application android:icon="@mipmap/ic_launcher" android:label="@string/app_name" android:largeHeap="true" android:name="org.glpi.inventory.agent.ui.InventoryAgentApp" android:requestLegacyExternalStorage="true" android:roundIcon="@drawable/ic_launcher_round" android:theme="@style/AppTheme" android:vmSafeMode="true">
36+
37+
<uses-library android:name="org.apache.http.legacy" android:required="false"/>
38+
39+
<meta-data android:name="firebase_crashlytics_collection_enabled" android:value="${crashlyticsEnabled}"/>
40+
41+
<activity android:exported="true" android:name="org.glpi.inventory.agent.ui.ActivitySplash" android:theme="@style/NoActionBar">
5942
<intent-filter>
60-
<action android:name="android.intent.action.MAIN" />
43+
<action android:name="android.intent.action.MAIN"/>
6144

62-
<category android:name="android.intent.category.LAUNCHER" />
45+
<category android:name="android.intent.category.LAUNCHER"/>
6346
</intent-filter>
6447
</activity>
6548

66-
<activity
67-
android:name=".ui.ScanActivity"
68-
android:launchMode="singleInstance"
69-
android:screenOrientation="landscape"></activity>
70-
71-
<activity
72-
android:name="org.glpi.inventory.agent.ui.ActivityMain"
73-
android:configChanges="orientation|screenSize"
74-
android:requestLegacyExternalStorage="true"
75-
android:exported="true"
76-
android:label="@string/app_name" />
77-
<activity
78-
android:name="org.glpi.inventory.agent.preference.InventoryParametersPreference"
79-
android:label="@string/app_name" />
80-
<activity
81-
android:name="org.glpi.inventory.agent.preference.GlobalParametersPreference"
82-
android:label="@string/app_name" />
83-
<activity
84-
android:name="org.glpi.inventory.agent.ui.ActivityInventoryReport"
85-
android:label="@string/app_name"
86-
android:launchMode="standard"
87-
android:theme="@style/NoActionBar" />
88-
89-
<service
90-
android:name="org.glpi.inventory.agent.service.InventoryService"
91-
android:description="@string/agent_description"
92-
android:enabled="true"
93-
android:icon="@mipmap/ic_launcher"
94-
android:label="Inventory Agent"
95-
tools:ignore="ExportedService">
49+
<activity android:launchMode="singleInstance" android:name=".ui.ScanActivity" android:screenOrientation="landscape"/>
50+
51+
<activity android:configChanges="orientation|screenSize" android:label="@string/app_name" android:name="org.glpi.inventory.agent.ui.ActivityMain" android:requestLegacyExternalStorage="true"/>
52+
<activity android:label="@string/app_name" android:name="org.glpi.inventory.agent.preference.InventoryParametersPreference"/>
53+
<activity android:label="@string/app_name" android:name="org.glpi.inventory.agent.preference.GlobalParametersPreference"/>
54+
<activity android:label="@string/app_name" android:launchMode="standard" android:name="org.glpi.inventory.agent.ui.ActivityInventoryReport" android:theme="@style/NoActionBar"/>
55+
56+
<service android:description="@string/agent_description" android:enabled="true" android:exported="true" android:icon="@mipmap/ic_launcher" android:label="Inventory Agent" android:name="org.glpi.inventory.agent.service.InventoryService" tools:ignore="ExportedService">
9657
<intent-filter>
97-
<action android:name="org.glpi.inventory.service" />
58+
<action android:name="org.glpi.inventory.service"/>
9859
</intent-filter>
9960
</service>
10061

101-
<receiver android:name="org.glpi.inventory.agent.broadcast.BootStartAgent"
102-
android:enabled="true"
103-
android:exported="true"
104-
android:permission="android.permission.RECEIVE_BOOT_COMPLETED">
62+
<receiver android:enabled="true" android:exported="true" android:name="org.glpi.inventory.agent.broadcast.BootStartAgent" android:permission="android.permission.RECEIVE_BOOT_COMPLETED">
10563
<intent-filter>
106-
<action android:name="android.intent.action.BOOT_COMPLETED" />
107-
<action android:name="android.intent.action.ACTION_BOOT_COMPLETED" />
108-
<action android:name="android.intent.action.REBOOT" />
109-
<action android:name="android.intent.action.QUICKBOOT_POWERON" />
110-
<action android:name="com.htc.intent.action.QUICKBOOT_POWERON" />
111-
<action android:name="android.intent.action.ACTION_SHUTDOWN" />
64+
<action android:name="android.intent.action.BOOT_COMPLETED"/>
65+
<action android:name="android.intent.action.ACTION_BOOT_COMPLETED"/>
66+
<action android:name="android.intent.action.REBOOT"/>
67+
<action android:name="android.intent.action.QUICKBOOT_POWERON"/>
68+
<action android:name="com.htc.intent.action.QUICKBOOT_POWERON"/>
69+
<action android:name="android.intent.action.ACTION_SHUTDOWN"/>
11270
</intent-filter>
11371
</receiver>
114-
<receiver android:name="org.glpi.inventory.agent.broadcast.TimeAlarm">
72+
<receiver android:exported="true" android:name="org.glpi.inventory.agent.broadcast.TimeAlarm">
11573
<intent-filter>
116-
<action android:name="org.glpi.inventory.agent.ALARM" />
74+
<action android:name="org.glpi.inventory.agent.ALARM"/>
11775
</intent-filter>
11876
</receiver>
11977

120-
<activity android:name="org.glpi.inventory.agent.ui.PermissionActivity" />
121-
<activity android:name="org.glpi.inventory.agent.ui.ActivityListServers" />
122-
<activity android:name="org.glpi.inventory.agent.ui.ActivityDetailServer">
78+
<activity android:name="org.glpi.inventory.agent.ui.PermissionActivity"/>
79+
<activity android:name="org.glpi.inventory.agent.ui.ActivityListServers"/>
80+
<activity android:exported="true" android:name="org.glpi.inventory.agent.ui.ActivityDetailServer">
12381
<intent-filter>
124-
<action android:name="android.intent.action.VIEW" />
82+
<action android:name="android.intent.action.VIEW"/>
12583

126-
<category android:name="android.intent.category.DEFAULT" />
127-
<category android:name="android.intent.category.BROWSABLE" />
84+
<category android:name="android.intent.category.DEFAULT"/>
85+
<category android:name="android.intent.category.BROWSABLE"/>
12886

129-
<data
130-
android:host="glpi-project.github.io"
131-
android:pathPrefix="/android-inventory-agent/deeplink"/>
132-
<data android:scheme="http" />
133-
<data android:scheme="https" />
87+
<data android:host="glpi-project.github.io" android:pathPrefix="/android-inventory-agent/deeplink"/>
88+
<data android:scheme="http"/>
89+
<data android:scheme="https"/>
13490
</intent-filter>
13591

13692
</activity>
137-
<activity android:name="org.glpi.inventory.agent.ui.ActivityCategories" />
93+
<activity android:name="org.glpi.inventory.agent.ui.ActivityCategories"/>
13894
</application>
13995

14096
</manifest>

‎app/src/main/assets/about.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
about.version=1.2.0
2-
about.build=39351
3-
about.date=ven. août 25 11:27:12 2023
2+
about.build=1.0
3+
about.date=lun. août 28 10:40:12 2023
44
about.commit=
55
about.commitFull=
66
about.github=https://github.com/glpi-project/android-inventory-agent

‎build.gradle

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,11 @@ buildscript {
55
google()
66
mavenCentral()
77
jcenter()
8-
maven{
9-
url 'https://maven.fabric.io/public'
10-
}
118
}
129
dependencies {
13-
classpath 'com.android.tools.build:gradle:4.0.2'
14-
classpath 'com.google.gms:google-services:4.3.4'
15-
classpath 'com.google.firebase:firebase-crashlytics-gradle:2.3.0'
10+
classpath 'com.android.tools.build:gradle:7.3.1'
11+
classpath 'com.google.gms:google-services:4.3.14'
12+
classpath 'com.google.firebase:firebase-crashlytics-gradle:2.5.2'
1613

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

‎gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-all.zip

0 commit comments

Comments
 (0)