Modify wrong imports to fix #7, compile with SDK 28

modular-ftc · Jan 23, 2019 · 0ffec7a · 0ffec7a
1 parent 7c18173
commit 0ffec7a
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 9 deletions.
diff --git a/library/build.gradle b/library/build.gradle
@@ -2,7 +2,7 @@ apply plugin: 'com.android.library'
 apply plugin: 'com.github.dcendents.android-maven'
 
 android {
- compileSdkVersion 27
+ compileSdkVersion 28
  defaultConfig {
  minSdkVersion 19
  // Required to bypass runtime Camera permissions

diff --git a/library/src/main/java/com/qualcomm/robotcore/hardware/configuration/Utility.java b/library/src/main/java/com/qualcomm/robotcore/hardware/configuration/Utility.java
@@ -42,7 +42,7 @@ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 import android.widget.LinearLayout;
 import android.widget.TextView;
 
-import junit.framework.Assert;
+import org.firstinspires.ftc.robotcore.internal.system.Assert;
 
 /**
  * {@link Utility} is an <em>old</em> general purpose utility class.

diff --git a/library/src/main/java/com/qualcomm/robotcore/hardware/usb/RobotUsbDeviceImplBase.java b/library/src/main/java/com/qualcomm/robotcore/hardware/usb/RobotUsbDeviceImplBase.java
@@ -38,7 +38,7 @@ are permitted (subject to the limitations in the disclaimer below) provided that
 import com.qualcomm.robotcore.util.RobotLog;
 import com.qualcomm.robotcore.util.SerialNumber;
 
-import junit.framework.Assert;
+import org.firstinspires.ftc.robotcore.internal.system.Assert;
 
 import java.util.Collection;
 import java.util.concurrent.ConcurrentHashMap;

diff --git a/library/src/main/java/org/firstinspires/ftc/robotcore/external/navigation/Orientation.java b/library/src/main/java/org/firstinspires/ftc/robotcore/external/navigation/Orientation.java
@@ -32,7 +32,7 @@ are permitted (subject to the limitations in the disclaimer below) provided that
 */
 package org.firstinspires.ftc.robotcore.external.navigation;
 
-import junit.framework.Assert;
+import org.firstinspires.ftc.robotcore.internal.system.Assert;
 
 import org.firstinspires.ftc.robotcore.external.matrices.MatrixF;
 import org.firstinspires.ftc.robotcore.external.matrices.OpenGLMatrix;

diff --git a/library/src/main/java/org/firstinspires/ftc/robotcore/internal/opmode/TelemetryImpl.java b/library/src/main/java/org/firstinspires/ftc/robotcore/internal/opmode/TelemetryImpl.java
@@ -35,12 +35,12 @@ are permitted (subject to the limitations in the disclaimer below) provided that
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 
-import com.android.internal.util.Predicate;
 import com.qualcomm.robotcore.eventloop.opmode.OpMode;
 import com.qualcomm.robotcore.robocol.TelemetryMessage;
 import com.qualcomm.robotcore.util.ElapsedTime;
 
 import org.firstinspires.ftc.robotcore.external.Func;
+import org.firstinspires.ftc.robotcore.external.Predicate;
 import org.firstinspires.ftc.robotcore.external.Telemetry;
 
 import java.util.ArrayList;
@@ -246,7 +246,7 @@ boolean removeAllRecurse(Predicate<ItemImpl> predicate)
  }
  else if (cur instanceof ItemImpl)
  {
- if (predicate.apply((ItemImpl)cur))
+ if (predicate.test((ItemImpl)cur))
  {
  list.remove(i);
  result = true;
@@ -922,7 +922,7 @@ protected void onAddData()
  //
  this.lines.removeAllRecurse(new Predicate<ItemImpl>()
  {
- @Override public boolean apply(ItemImpl item)
+ @Override public boolean test(ItemImpl item)
  {
  return !item.isRetained();
  }
@@ -940,7 +940,7 @@ protected void onAddData()
  this.actions.clear();
  this.lines.removeAllRecurse(new Predicate<ItemImpl>()
  {
- @Override public boolean apply(ItemImpl item)
+ @Override public boolean test(ItemImpl item)
  {
  return true;
  }

diff --git a/to-check-for-modification.md b/to-check-for-modification.md
@@ -1,3 +1,7 @@
 Files modified:
 
-- `src/main/java/com/qualcomm/robotcore/util/ClassUtil.java`
+- `src/main/java/com/qualcomm/robotcore/util/ClassUtil.java`
+- `src/main/java/com/qualcomm/robotcore/hardware/usb/RobotUsbDeviceImplBase.java`
+- `src/main/java/com/qualcomm/robotcore/hardware/configuration/Utility.java`
+- `src/main/java/org/firstinspires/ftc/robotcore/external/navigation/Orientation.java`
+- `src/main/java/org/firstinspires/ftc/robotcore/internal/opmode/TelemetryImpl.java`