diff options
author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | 2024-05-14 00:42:45 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2024-05-14 00:42:45 +0000 |
commit | f5e40ed013b0da5f74b2aa6f5c67011c362a6715 (patch) | |
tree | 3820d850194ed1aa3a770a88c47a1920484f44d4 | |
parent | c17c482705da149bfaa9bb1f3ee63a98f82d93c4 (diff) | |
parent | e3f9546ff1bf10dadab49d71065332b9f89d0462 (diff) | |
download | robolectric-f5e40ed013b0da5f74b2aa6f5c67011c362a6715.tar.gz |
Merge "Turn on robolectric compile time validtor" into main
7 files changed, 15 insertions, 2 deletions
diff --git a/shadows/framework/Android.bp b/shadows/framework/Android.bp index 3d487fbff..493b84870 100644 --- a/shadows/framework/Android.bp +++ b/shadows/framework/Android.bp @@ -22,8 +22,8 @@ java_library { java_resource_dirs: ["src/main/resources"], javacflags: [ "-Aorg.robolectric.annotation.processing.shadowPackage=org.robolectric", - //"-Aorg.robolectric.annotation.processing.sdkCheckMode=ERROR", - //"-Aorg.robolectric.annotation.processing.validateCompileSdk=true", + "-Aorg.robolectric.annotation.processing.sdkCheckMode=ERROR", + "-Aorg.robolectric.annotation.processing.validateCompileSdk=true", // Uncomment the below to debug annotation processors not firing. //"-verbose", //"-XprintRounds", diff --git a/shadows/framework/src/main/java/org/robolectric/shadows/ShadowCameraManager.java b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowCameraManager.java index be1e29713..deea97e5a 100644 --- a/shadows/framework/src/main/java/org/robolectric/shadows/ShadowCameraManager.java +++ b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowCameraManager.java @@ -26,6 +26,7 @@ import javax.annotation.Nullable; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Implementation; import org.robolectric.annotation.Implements; +import org.robolectric.annotation.InDevelopment; import org.robolectric.annotation.RealObject; import org.robolectric.annotation.Resetter; import org.robolectric.util.ReflectionHelpers; @@ -84,6 +85,7 @@ public class ShadowCameraManager { } @Implementation(minSdk = U.SDK_INT) + @InDevelopment protected CameraDevice openCameraDeviceUserAsync( String cameraId, CameraDevice.StateCallback callback, diff --git a/shadows/framework/src/main/java/org/robolectric/shadows/ShadowMotionEvent.java b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowMotionEvent.java index ba220ffe0..4c1ecd3c9 100644 --- a/shadows/framework/src/main/java/org/robolectric/shadows/ShadowMotionEvent.java +++ b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowMotionEvent.java @@ -25,6 +25,7 @@ import java.lang.reflect.Field; import java.lang.reflect.Modifier; import java.util.List; import org.robolectric.annotation.HiddenApi; +import org.robolectric.annotation.InDevelopment; import org.robolectric.annotation.Implementation; import org.robolectric.annotation.Implements; import org.robolectric.annotation.InDevelopment; @@ -635,12 +636,14 @@ public class ShadowMotionEvent extends ShadowInputEvent { @Implementation(minSdk = V.SDK_INT) @HiddenApi + @InDevelopment protected static float nativeGetRawXOffset(long nativePtr) { return getNativeMotionEvent(nativePtr).getXOffset(); } @Implementation(minSdk = V.SDK_INT) @HiddenApi + @InDevelopment protected static float nativeGetRawYOffset(long nativePtr) { return getNativeMotionEvent(nativePtr).getYOffset(); } diff --git a/shadows/framework/src/main/java/org/robolectric/shadows/ShadowNativeFont.java b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowNativeFont.java index 23f5b7f86..c643f6782 100644 --- a/shadows/framework/src/main/java/org/robolectric/shadows/ShadowNativeFont.java +++ b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowNativeFont.java @@ -20,6 +20,7 @@ import java.io.IOException; import java.io.InputStream; import java.nio.ByteBuffer; import java.nio.ByteOrder; +import org.robolectric.annotation.InDevelopment; import org.robolectric.annotation.Implementation; import org.robolectric.annotation.Implements; import org.robolectric.annotation.RealObject; @@ -46,6 +47,7 @@ public class ShadowNativeFont { * This must be deferred starting in Android V. */ @Implementation(minSdk = V.SDK_INT) + @InDevelopment protected static void __staticInitializer__() {} @Implementation(minSdk = S, maxSdk = U.SDK_INT) diff --git a/shadows/framework/src/main/java/org/robolectric/shadows/ShadowNativeFontsFontFamily.java b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowNativeFontsFontFamily.java index d2174f977..b2548db47 100644 --- a/shadows/framework/src/main/java/org/robolectric/shadows/ShadowNativeFontsFontFamily.java +++ b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowNativeFontsFontFamily.java @@ -5,6 +5,7 @@ import static android.os.Build.VERSION_CODES.S; import static android.os.Build.VERSION_CODES.TIRAMISU; import android.graphics.fonts.FontFamily; +import org.robolectric.annotation.InDevelopment; import org.robolectric.annotation.Implementation; import org.robolectric.annotation.Implements; import org.robolectric.nativeruntime.DefaultNativeRuntimeLoader; @@ -53,6 +54,7 @@ public class ShadowNativeFontsFontFamily { public static class ShadowNativeFontFamilyBuilder { @Implementation(minSdk = V.SDK_INT) + @InDevelopment protected static void __staticInitializer__() {} @Implementation(maxSdk = U.SDK_INT) diff --git a/shadows/framework/src/main/java/org/robolectric/shadows/ShadowNativeLineBreaker.java b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowNativeLineBreaker.java index ce0b92f7e..365f694f7 100644 --- a/shadows/framework/src/main/java/org/robolectric/shadows/ShadowNativeLineBreaker.java +++ b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowNativeLineBreaker.java @@ -5,6 +5,7 @@ import static android.os.Build.VERSION_CODES.Q; import android.annotation.FloatRange; import android.annotation.IntRange; import android.graphics.text.LineBreaker; +import org.robolectric.annotation.InDevelopment; import org.robolectric.annotation.Implementation; import org.robolectric.annotation.Implements; import org.robolectric.nativeruntime.DefaultNativeRuntimeLoader; @@ -22,6 +23,7 @@ import org.robolectric.versioning.AndroidVersions.V; public class ShadowNativeLineBreaker { @Implementation(minSdk = V.SDK_INT) + @InDevelopment protected static void __staticInitializer__() {} @Implementation(maxSdk = U.SDK_INT) diff --git a/shadows/framework/src/main/java/org/robolectric/shadows/ShadowNativePositionedGlyphs.java b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowNativePositionedGlyphs.java index 5b65023af..15a8c2a11 100644 --- a/shadows/framework/src/main/java/org/robolectric/shadows/ShadowNativePositionedGlyphs.java +++ b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowNativePositionedGlyphs.java @@ -1,6 +1,7 @@ package org.robolectric.shadows; import android.graphics.text.PositionedGlyphs; +import org.robolectric.annotation.InDevelopment; import org.robolectric.annotation.Implementation; import org.robolectric.annotation.Implements; import org.robolectric.nativeruntime.DefaultNativeRuntimeLoader; @@ -22,6 +23,7 @@ public class ShadowNativePositionedGlyphs { * deferred starting in Android V. */ @Implementation(minSdk = V.SDK_INT) + @InDevelopment protected static void __staticInitializer__() { // deferred } |