fix gradlew line errors

rilling · Oct 15, 2023 · cb402d4 · cb402d4
1 parent e85c505
commit cb402d4
Show file tree

Hide file tree

Showing 11 changed files with 35 additions and 15 deletions.
diff --git a/build.gradle b/build.gradle
@@ -4,12 +4,19 @@ buildscript {
     repositories {
         google()
         mavenCentral()
+
+        maven {
+            url "https://plugins.gradle.org/m2/"
+        }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:8.2.0-beta01'
+        classpath 'com.android.tools.build:gradle:8.1.2'
+        classpath "org.sonarsource.scanner.gradle:sonarqube-gradle-plugin:4.4.0.3356"
     }
 }
 
+apply plugin: "org.sonarqube"
+
 allprojects {
     repositories {
         google()
@@ -43,6 +50,19 @@ def getVersionCode = { ->
     }
 }
 
+sonar {
+    properties {
+        property "sonar.projectKey", "opentracks"
+        property "sonar.host.url", "http://localhost:9000"
+        property "sonar.sources", "src/main/java"
+        property "sonar.exclusions", '**/*Test*/**,' +
+                '*.json,' +
+                '**/*test*/**,' +
+                '**/.gradle/**,' +
+                '**/R.class'
+    }
+}
+
 android {
     compileOptions {
         coreLibraryDesugaringEnabled true

diff --git a/...dTest/java/de/dennisguse/opentracks/services/announcement/VoiceAnnouncementUtilsTest.java b/...dTest/java/de/dennisguse/opentracks/services/announcement/VoiceAnnouncementUtilsTest.java
@@ -312,7 +312,7 @@ public void getAnnouncement_heart_rate_and_sensor_statistics() {
             lastInterval = intervalStatistics.getIntervalList().get(intervalStatistics.getIntervalList().size() - 1);
         }
 
-        SensorStatistics sensorStatistics = new SensorStatistics(HeartRate.of(180f), HeartRate.of(180f), null, null, null);
+        SensorStatistics sensorStatistics = new SensorStatistics(HeartRate.of(180f), HeartRate.of(180f), null, null, null, null);
 
         // when
         String announcement = VoiceAnnouncementUtils.getAnnouncement(context, stats, UnitSystem.METRIC, true, lastInterval, sensorStatistics).toString();
@@ -342,7 +342,7 @@ public void getAnnouncement_only_lap_heart_rate() {
             lastInterval = intervalStatistics.getIntervalList().get(intervalStatistics.getIntervalList().size() - 1);
         }
 
-        SensorStatistics sensorStatistics = new SensorStatistics(HeartRate.of(180f), HeartRate.of(180f), null, null, null);
+        SensorStatistics sensorStatistics = new SensorStatistics(HeartRate.of(180f), HeartRate.of(180f), null, null, null, null);
 
         // when
         String announcement = VoiceAnnouncementUtils.getAnnouncement(context, stats, UnitSystem.METRIC, true, lastInterval, sensorStatistics).toString();

diff --git a/src/main/java/de/dennisguse/opentracks/ui/customRecordingLayout/CsvLayoutUtils.java b/src/main/java/de/dennisguse/opentracks/ui/customRecordingLayout/CsvLayoutUtils.java
@@ -1,4 +1,4 @@
-package de.dennisguse.opentracks.ui.customrecordinglayout;
+package de.dennisguse.opentracks.ui.customRecordingLayout;
 
 import androidx.annotation.Nullable;
 

diff --git a/src/main/java/de/dennisguse/opentracks/ui/customRecordingLayout/CustomLayoutFieldType.java b/src/main/java/de/dennisguse/opentracks/ui/customRecordingLayout/CustomLayoutFieldType.java
@@ -1,4 +1,4 @@
-package de.dennisguse.opentracks.ui.customrecordinglayout;
+package de.dennisguse.opentracks.ui.customRecordingLayout;
 
 public enum CustomLayoutFieldType {
     GENERIC(1),

diff --git a/src/main/java/de/dennisguse/opentracks/ui/customRecordingLayout/DataField.java b/src/main/java/de/dennisguse/opentracks/ui/customRecordingLayout/DataField.java
@@ -1,4 +1,4 @@
-package de.dennisguse.opentracks.ui.customrecordinglayout;
+package de.dennisguse.opentracks.ui.customRecordingLayout;
 
 import android.os.Parcel;
 import android.os.Parcelable;

diff --git a/src/main/java/de/dennisguse/opentracks/ui/customRecordingLayout/RecordingLayout.java b/src/main/java/de/dennisguse/opentracks/ui/customRecordingLayout/RecordingLayout.java
@@ -1,4 +1,4 @@
-package de.dennisguse.opentracks.ui.customrecordinglayout;
+package de.dennisguse.opentracks.ui.customRecordingLayout;
 
 import android.os.Parcel;
 import android.os.Parcelable;

diff --git a/src/main/java/de/dennisguse/opentracks/ui/customRecordingLayout/RecordingLayoutIO.java b/src/main/java/de/dennisguse/opentracks/ui/customRecordingLayout/RecordingLayoutIO.java
@@ -1,4 +1,4 @@
-package de.dennisguse.opentracks.ui.customrecordinglayout;
+package de.dennisguse.opentracks.ui.customRecordingLayout;
 
 import android.content.res.Resources;
 import android.util.Log;

diff --git a/...va/de/dennisguse/opentracks/ui/customRecordingLayout/SettingsCustomLayoutEditAdapter.java b/...va/de/dennisguse/opentracks/ui/customRecordingLayout/SettingsCustomLayoutEditAdapter.java
@@ -1,4 +1,4 @@
-package de.dennisguse.opentracks.ui.customrecordinglayout;
+package de.dennisguse.opentracks.ui.customRecordingLayout;
 
 import android.content.Context;
 import android.util.Log;

diff --git a/...va/de/dennisguse/opentracks/ui/customRecordingLayout/SettingsCustomLayoutListAdapter.java b/...va/de/dennisguse/opentracks/ui/customRecordingLayout/SettingsCustomLayoutListAdapter.java
@@ -1,4 +1,4 @@
-package de.dennisguse.opentracks.ui.customrecordinglayout;
+package de.dennisguse.opentracks.ui.customRecordingLayout;
 
 import android.content.Context;
 import android.view.LayoutInflater;

diff --git a/src/main/java/de/dennisguse/opentracks/ui/markers/MarkerDetailFragment.java b/src/main/java/de/dennisguse/opentracks/ui/markers/MarkerDetailFragment.java
@@ -80,7 +80,8 @@ public void onAnimationStart(Animation anim) {
                     throw new UnsupportedOperationException("onAnimationStart is not supported for this class.");
                 }
 
-
+                @Override
+                public void onAnimationRepeat(Animation anim) {}
 
 
                 @Override

diff --git a/src/main/java/de/dennisguse/opentracks/ui/util/ScrollVisibleViews.java b/src/main/java/de/dennisguse/opentracks/ui/util/ScrollVisibleViews.java
@@ -20,15 +20,14 @@ public ScrollVisibleViews(@NonNull VisibleViewsListener visibleViewsListener) {
 
     @Override
     public void onScrollStateChanged(AbsListView view, int scrollState) {
-        if (scrollState == AbsListView.OnScrollListener.SCROLL_STATE_IDLE || scrollState == AbsListView.OnScrollListener.SCROLL_STATE_FLING || scrollState == AbsListView.OnScrollListener.SCROLL_STATE_TOUCH_SCROLL) {
-            if (from >= 0 && to >= 0) {
+        if ((scrollState == AbsListView.OnScrollListener.SCROLL_STATE_IDLE || scrollState == AbsListView.OnScrollListener.SCROLL_STATE_FLING || scrollState == AbsListView.OnScrollListener.SCROLL_STATE_TOUCH_SCROLL) && from >= 0 && to >= 0)
+         {
                 for (int i = from; i < to; i++) {
                     View viewChild = view.getChildAt(i - from);
                     visibleViewsListener.onViewVisible(viewChild, i);
                 }
             }
         }
-    }
 
     @Override
     public void onScroll(AbsListView view, int firstVisibleItem, int visibleItemCount, int totalItemCount) {
@@ -39,4 +38,4 @@ public void onScroll(AbsListView view, int firstVisibleItem, int visibleItemCoun
     public interface VisibleViewsListener {
         void onViewVisible(View view, int position);
     }
-}
+}