Revert "Assertion arguments should be passed in the correct order"

build.gradle

@@ -1,17 +1,12 @@
 apply plugin: 'com.android.application'
 
 buildscript {
-    ext {
-        agp_version = '8.1.1'
-    }
     repositories {
         google()
         mavenCentral()
     }
     dependencies {
-        classpath "com.android.tools.build:gradle:$agp_version"
-        classpath "org.sonarsource.scanner.gradle:sonarqube-gradle-plugin:2.7.1"
-
+        classpath 'com.android.tools.build:gradle:8.2.0-beta01'
     }
 }
 
@@ -22,26 +17,6 @@ allprojects {
     }
 }
 
-apply plugin: "org.sonarqube"
-
-sonarqube {
-    properties {
-        property "sonar.projectName", "OpenTracksConcordia"
-        property "sonar.projectKey", "OpenTracksConcordia"
-        property "sonar.tests", ["src/androidTest/java"]
-        property "sonar.test.inclusions", "*/*Test/**"
-        property "sonar.sourceEncoding", "UTF-8"
-        property "sonar.sources", "src/main/java"
-        property "sonar.exclusions", '*/*Test/**,' +
-                '*.json,' +
-                '*/*test/**,' +
-                '**/.gradle/**,' +
-                '**/R.class'
-    }
-}
-
-
-
 def getVersionName = { ->
     try {
         def stdout = new ByteArrayOutputStream()

gradle.properties

@@ -1,5 +1,2 @@
 android.useAndroidX=true
 org.gradle.jvmargs=-Xmx1024m
-systemProp.sonar.host.url=http://localhost:9000
-systemProp.sonar.login=sqp_61650630da8d6ff10b29db5c39ba42ef7feed25e
-

gradle/wrapper/gradle-wrapper.properties

@@ -1,7 +1,6 @@
-#Sun Oct 08 22:27:07 EDT 2023
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

src/androidTest/java/de/dennisguse/opentracks/settings/PreferencesUtilsTest.java

@@ -309,11 +309,11 @@ public void testEditCustomLayout() {
         // then only updated profile is modified in the custom layouts
         List<RecordingLayout> layoutsAfter = PreferencesUtils.getAllCustomLayouts();
 
-        assertEquals(2, layoutsBefore.size());
-        assertEquals(2, layoutsAfter.size());
+        assertEquals(layoutsBefore.size(), 2);
+        assertEquals(layoutsAfter.size(), 2);
 
-        assertEquals(4, layoutsBefore.get(0).getFields().stream().filter(DataField::isVisible).count());
-        assertEquals(1, layoutsAfter.get(0).getFields().stream().filter(DataField::isVisible).count());
+        assertEquals(layoutsBefore.get(0).getFields().stream().filter(DataField::isVisible).count(), 4);
+        assertEquals(layoutsAfter.get(0).getFields().stream().filter(DataField::isVisible).count(), 1);
     }
 
     @Test