glpi-project · stonebuzz · Aug 21, 2025 · Jul 16, 2025 · Jul 16, 2025 · Jul 16, 2025
diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml
@@ -13,10 +13,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v4
-    - name: set up JDK 11
+    - name: set up JDK 17
       uses: actions/setup-java@v4
       with:
-        java-version: '11'
+        java-version: '17'
         distribution: 'temurin'
         cache: gradle
 
@@ -67,7 +67,7 @@ jobs:
         gcloud firebase test android run --type instrumentation --app ${{ env.module_app }}/build/outputs/apk/debug/${{ env.module_app }}-debug.apk --test ${{ env.module_app }}/build/outputs/apk/androidTest/debug/${{ env.module_app }}-debug-androidTest.apk --device model=e1q,version=34,locale=en,orientation=portrait
         gcloud firebase test android run --type instrumentation --app ${{ env.module_app }}/build/outputs/apk/debug/${{ env.module_app }}-debug.apk --test ${{ env.module_app }}/build/outputs/apk/androidTest/debug/${{ env.module_app }}-debug-androidTest.apk --device model=dm3q,version=33,locale=en,orientation=portrait
         gcloud firebase test android run --type instrumentation --app ${{ env.module_app }}/build/outputs/apk/debug/${{ env.module_app }}-debug.apk --test ${{ env.module_app }}/build/outputs/apk/androidTest/debug/${{ env.module_app }}-debug-androidTest.apk --device model=bluejay,version=32,locale=en,orientation=portrait
-        gcloud firebase test android run --type instrumentation --app ${{ env.module_app }}/build/outputs/apk/debug/${{ env.module_app }}-debug.apk --test ${{ env.module_app }}/build/outputs/apk/androidTest/debug/${{ env.module_app }}-debug-androidTest.apk --device model=a51,version=31,locale=en,orientation=portrait
+        gcloud firebase test android run --type instrumentation --app ${{ env.module_app }}/build/outputs/apk/debug/${{ env.module_app }}-debug.apk --test ${{ env.module_app }}/build/outputs/apk/androidTest/debug/${{ env.module_app }}-debug-androidTest.apk --device model=oriole,version=31,locale=en,orientation=portrait
         gcloud firebase test android run --type instrumentation --app ${{ env.module_app }}/build/outputs/apk/debug/${{ env.module_app }}-debug.apk --test ${{ env.module_app }}/build/outputs/apk/androidTest/debug/${{ env.module_app }}-debug-androidTest.apk --device model=redfin,version=30,locale=en,orientation=portrait
         gcloud firebase test android run --type instrumentation --app ${{ env.module_app }}/build/outputs/apk/debug/${{ env.module_app }}-debug.apk --test ${{ env.module_app }}/build/outputs/apk/androidTest/debug/${{ env.module_app }}-debug-androidTest.apk --device model=cactus,version=27,locale=en,orientation=portrait
 

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,6 +6,10 @@ All notable changes to this project will be documented in this file.
 
 ### 💼 Other
 
+- *(Build)* Move to SDK 35
+
+### 💼 Other
+
 - *(Build)* Fix trigger for CI
 
 ## [1.6.1] - 2024-12-20

diff --git a/app/build.gradle b/app/build.gradle
@@ -2,14 +2,15 @@ apply plugin: 'com.android.application'
 apply plugin: 'com.google.firebase.crashlytics'
 
 android {
-    compileSdk 34
+    compileSdk 35
     useLibrary 'org.apache.http.legacy'
 
     defaultConfig {
         applicationId "org.glpi.inventory.agent"
         minSdkVersion 21
-        targetSdkVersion 34
+        targetSdkVersion 35
 
+        android.buildFeatures.buildConfig = true
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         multiDexEnabled true
     }

diff --git a/app/src/main/res/layout/activity_detail_server.xml b/app/src/main/res/layout/activity_detail_server.xml
@@ -3,6 +3,7 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:fitsSystemWindows="true"
     xmlns:fbutton="http://schemas.android.com/tools"
     android:orientation="vertical">
 

diff --git a/app/src/main/res/layout/activity_inventory.xml b/app/src/main/res/layout/activity_inventory.xml
@@ -2,6 +2,7 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
+    android:fitsSystemWindows="true"
     android:layout_height="match_parent">
 
     <androidx.appcompat.widget.Toolbar

diff --git a/app/src/main/res/layout/activity_list_categories.xml b/app/src/main/res/layout/activity_list_categories.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
+    android:fitsSystemWindows="true"
     android:layout_height="match_parent">
 
     <androidx.appcompat.widget.Toolbar

diff --git a/app/src/main/res/layout/activity_list_servers.xml b/app/src/main/res/layout/activity_list_servers.xml
@@ -2,6 +2,7 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:fitsSystemWindows="true"
     xmlns:fbutton="http://schemas.android.com/tools">
 
     <androidx.appcompat.widget.Toolbar

diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
@@ -6,16 +6,15 @@
 	android:layout_height="match_parent"
 	android:layout_width="match_parent"
 	android:id="@+id/drawerLayout"
-	android:layout_gravity="left"
-
-	>
+	android:fitsSystemWindows="true">
 
 
 	<LinearLayout
 		android:id="@+id/anchor_for_fab"
 		android:layout_width="match_parent"
 		android:layout_height="match_parent"
 		android:orientation="vertical"
+		android:fitsSystemWindows="true"
 		>
 
 		<androidx.appcompat.widget.Toolbar
@@ -38,14 +37,14 @@
 				android:layout_width="match_parent"
 				android:layout_height="match_parent"
 				android:orientation="vertical"
-				android:gravity="right">
+				android:gravity="end">
 
 				<TextView
 					android:id="@+id/text_scheduler"
 					android:layout_width="wrap_content"
 					android:layout_height="wrap_content"
 					android:layout_alignParentBottom="true"
-					android:layout_marginRight="5dp"
+					android:layout_marginEnd="5dp"
 					android:layout_marginBottom="179dp"
 					android:background="@android:color/transparent"
 					android:hint="@string/AccueilInventoryParamSummary"
@@ -60,14 +59,14 @@
 					android:layout_width="wrap_content"
 					android:layout_height="wrap_content"
 					android:layout_alignParentBottom="true"
-					android:layout_marginRight="32dp"
+					android:layout_marginEnd="32dp"
 					android:layout_marginBottom="169dp"
 					android:layout_toRightOf="@id/text_scheduler"
 					android:background="?android:attr/selectableItemBackground"
 					android:clickable="true"
 					android:elevation="16dp"
 					android:focusable="true"
-					android:gravity="right"
+					android:gravity="end"
 					android:visibility="invisible"
 					app:backgroundTint="@color/colorAccent"
 					app:pressedTranslationZ="12dp"
@@ -79,14 +78,14 @@
 				android:layout_width="match_parent"
 				android:layout_height="match_parent"
 				android:orientation="vertical"
-				android:gravity="right">
+				android:gravity="end">
 
 				<TextView
 					android:id="@+id/text_settings"
 					android:layout_width="wrap_content"
 					android:layout_height="wrap_content"
 					android:layout_alignParentBottom="true"
-					android:layout_marginRight="10dp"
+					android:layout_marginEnd="10dp"
 					android:layout_marginBottom="116dp"
 					android:background="@android:color/transparent"
 					android:hint="@string/GlobalAdvanced"
@@ -102,14 +101,14 @@
 					android:layout_width="wrap_content"
 					android:layout_height="wrap_content"
 					android:layout_alignParentBottom="true"
-					android:layout_marginRight="32dp"
+					android:layout_marginEnd="32dp"
 					android:layout_marginBottom="106dp"
-					android:layout_toRightOf="@id/text_settings"
+					android:layout_toEndOf="@id/text_settings"
 					android:background="?android:attr/selectableItemBackground"
 					android:clickable="true"
 					android:elevation="16dp"
 					android:focusable="true"
-					android:gravity="right"
+					android:gravity="end"
 					android:visibility="invisible"
 					app:backgroundTint="@color/colorAccent"
 					app:pressedTranslationZ="12dp"
@@ -120,7 +119,7 @@
 				android:layout_width="match_parent"
 				android:layout_height="match_parent"
 				android:orientation="vertical"
-				android:gravity="right">
+				android:gravity="end">
 
 
 
@@ -160,48 +159,41 @@
 
 			</RelativeLayout>
 
-
-
 		</FrameLayout>
 
-
-
 	</LinearLayout>
 
 	<com.google.android.material.navigation.NavigationView
-		xmlns:android="http://schemas.android.com/apk/res/android"
-		xmlns:app="http://schemas.android.com/apk/res-auto"
 		android:layout_width="wrap_content"
 		android:layout_height="match_parent"
 		app:itemTextColor="#FFFFFF"
 		android:layout_gravity="start"
-		android:fitsSystemWindows="true"
-		>
+		android:fitsSystemWindows="true">
 
 		<LinearLayout
 			android:layout_width="match_parent"
 			android:layout_height="match_parent"
 			android:orientation="vertical"
-			>
-
-
-	<ImageView
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:src="@drawable/header_menu"
-        android:scaleType="centerCrop"
-        android:adjustViewBounds="true"
-        />
-
-    <ListView
-        android:id="@+id/lst"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:dividerHeight="0dp"
-        android:layout_marginTop="24dp"
-        android:divider="@null"
-        />
-</LinearLayout>
+			android:fitsSystemWindows="true">
+
+
+			<ImageView
+				android:layout_width="match_parent"
+				android:layout_height="wrap_content"
+				android:src="@drawable/header_menu"
+				android:scaleType="centerCrop"
+				android:adjustViewBounds="true"
+				/>
+
+			<ListView
+				android:id="@+id/lst"
+				android:layout_width="match_parent"
+				android:layout_height="match_parent"
+				android:dividerHeight="0dp"
+				android:layout_marginTop="24dp"
+				android:divider="@null"
+				/>
+		</LinearLayout>
 </com.google.android.material.navigation.NavigationView>
 
 

diff --git a/app/src/main/res/layout/fragment_inventory_tab.xml b/app/src/main/res/layout/fragment_inventory_tab.xml
@@ -2,7 +2,8 @@
 <RelativeLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="match_parent">
+    android:layout_height="match_parent"
+    android:fitsSystemWindows="true">
 
     <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/lst"

diff --git a/build.gradle b/build.gradle
@@ -7,7 +7,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.3.1'
+        classpath 'com.android.tools.build:gradle:8.11.1'
         classpath 'com.google.gms:google-services:4.3.14'
         classpath 'com.google.firebase:firebase-crashlytics-gradle:2.5.2'
 

diff --git a/gradle.properties b/gradle.properties
@@ -1,3 +1,5 @@
 org.gradle.jvmargs=-Xmx2048m
 android.useAndroidX=true
-android.enableJetifier=true
+android.enableJetifier=true
+android.nonTransitiveRClass=false
+android.nonFinalResIds=false
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,7 @@
-#Tue Oct 22 12:16:18 CEST 2019
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
+networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-all.zip