Skip to content

Commit edf9d32

Browse files
sjuddglide-copybara-robot
authored andcommittedFeb 19, 2022
Remove Glide's spotless integration.
It's causing spurious failures that can't be fixed. We can rely on internal formatting tools for now. PiperOrigin-RevId: 429667832
1 parent a607b1d commit edf9d32

15 files changed

+54
-36
lines changed
 

‎build.gradle

-18
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ buildscript {
1717
classpath "net.ltgt.gradle:gradle-errorprone-plugin:${ERROR_PRONE_PLUGIN_VERSION}"
1818
}
1919
classpath "se.bjurr.violations:violations-gradle-plugin:${VIOLATIONS_PLUGIN_VERSION}"
20-
classpath "com.diffplug.spotless:spotless-plugin-gradle:5.11.0"
2120
classpath "androidx.benchmark:benchmark-gradle-plugin:${ANDROID_X_BENCHMARK_VERSION}"
2221
}
2322
}
@@ -93,23 +92,6 @@ subprojects { project ->
9392
duplicatesStrategy = DuplicatesStrategy.FAIL
9493
}
9594

96-
def isDisallowedProject =
97-
project.name in ["third_party", "gif_decoder", "gif_encoder", "disklrucache", "glide"]
98-
if (!isDisallowedProject) {
99-
apply plugin: "com.diffplug.spotless"
100-
101-
spotless {
102-
java {
103-
target fileTree('.') {
104-
include '**/*.java'
105-
exclude '**/resources/**'
106-
exclude '**/build/**'
107-
}
108-
googleJavaFormat()
109-
}
110-
}
111-
}
112-
11395
apply plugin: 'checkstyle'
11496

11597
checkstyle {

‎library/src/main/java/com/bumptech/glide/Glide.java

+3-1
Original file line numberDiff line numberDiff line change
@@ -379,7 +379,9 @@ public ArrayPool getArrayPool() {
379379
return arrayPool;
380380
}
381381

382-
/** @return The context associated with this instance. */
382+
/**
383+
* @return The context associated with this instance.
384+
*/
383385
@NonNull
384386
public Context getContext() {
385387
return glideContext.getBaseContext();

‎library/src/main/java/com/bumptech/glide/load/engine/cache/DiskLruCacheWrapper.java

+3-1
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,9 @@ public static DiskCache create(File directory, long maxSize) {
6363
return new DiskLruCacheWrapper(directory, maxSize);
6464
}
6565

66-
/** @deprecated Do not extend this class. */
66+
/**
67+
* @deprecated Do not extend this class.
68+
*/
6769
@Deprecated
6870
// Deprecated public API.
6971
@SuppressWarnings({"WeakerAccess", "DeprecatedIsStillUsed"})

‎library/src/main/java/com/bumptech/glide/load/engine/executor/GlideExecutor.java

+12-4
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,9 @@ public static GlideExecutor newDiskCacheExecutor(
9494
return newDiskCacheBuilder().setUncaughtThrowableStrategy(uncaughtThrowableStrategy).build();
9595
}
9696

97-
/** @deprecated Use {@link #newDiskCacheBuilder()} instead. */
97+
/**
98+
* @deprecated Use {@link #newDiskCacheBuilder()} instead.
99+
*/
98100
// Public API.
99101
@SuppressWarnings("WeakerAccess")
100102
@Deprecated
@@ -127,7 +129,9 @@ public static GlideExecutor newSourceExecutor() {
127129
return newSourceBuilder().build();
128130
}
129131

130-
/** @deprecated Use {@link #newSourceBuilder()} instead. */
132+
/**
133+
* @deprecated Use {@link #newSourceBuilder()} instead.
134+
*/
131135
// Public API.
132136
@SuppressWarnings("unused")
133137
@Deprecated
@@ -136,7 +140,9 @@ public static GlideExecutor newSourceExecutor(
136140
return newSourceBuilder().setUncaughtThrowableStrategy(uncaughtThrowableStrategy).build();
137141
}
138142

139-
/** @deprecated Use {@link #newSourceBuilder()} instead. */
143+
/**
144+
* @deprecated Use {@link #newSourceBuilder()} instead.
145+
*/
140146
// Public API.
141147
@SuppressWarnings("WeakerAccess")
142148
@Deprecated
@@ -202,7 +208,9 @@ public static GlideExecutor newAnimationExecutor() {
202208
return newAnimationBuilder().build();
203209
}
204210

205-
/** @deprecated Use {@link #newAnimationBuilder()} instead. */
211+
/**
212+
* @deprecated Use {@link #newAnimationBuilder()} instead.
213+
*/
206214
// Public API.
207215
@SuppressWarnings("WeakerAccess")
208216
@Deprecated

‎library/src/main/java/com/bumptech/glide/load/model/UnitModelLoader.java

+6-2
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,9 @@ public static <T> UnitModelLoader<T> getInstance() {
2222
return (UnitModelLoader<T>) INSTANCE;
2323
}
2424

25-
/** @deprecated Use {@link #getInstance()} instead. */
25+
/**
26+
* @deprecated Use {@link #getInstance()} instead.
27+
*/
2628
// Need constructor to document deprecation, will be removed, when constructor is privatized.
2729
@SuppressWarnings({"PMD.UnnecessaryConstructor", "DeprecatedIsStillUsed"})
2830
@Deprecated
@@ -95,7 +97,9 @@ public static <T> Factory<T> getInstance() {
9597
return (Factory<T>) FACTORY;
9698
}
9799

98-
/** @deprecated Use {@link #getInstance()} instead. */
100+
/**
101+
* @deprecated Use {@link #getInstance()} instead.
102+
*/
99103
// Need constructor to document deprecation, will be removed, when constructor is privatized.
100104
@SuppressWarnings("PMD.UnnecessaryConstructor")
101105
@Deprecated

‎library/src/main/java/com/bumptech/glide/load/resource/bitmap/BitmapEncoder.java

+3-1
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,9 @@ public BitmapEncoder(@NonNull ArrayPool arrayPool) {
5656
this.arrayPool = arrayPool;
5757
}
5858

59-
/** @deprecated Use {@link #BitmapEncoder(ArrayPool)} instead. */
59+
/**
60+
* @deprecated Use {@link #BitmapEncoder(ArrayPool)} instead.
61+
*/
6062
@Deprecated
6163
public BitmapEncoder() {
6264
arrayPool = null;

‎library/src/main/java/com/bumptech/glide/load/resource/transcode/BitmapDrawableTranscoder.java

+3-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,9 @@ public BitmapDrawableTranscoder(@NonNull Context context) {
2525
this(context.getResources());
2626
}
2727

28-
/** @deprecated Use {@link #BitmapDrawableTranscoder(Resources)}, {@code bitmapPool} is unused. */
28+
/**
29+
* @deprecated Use {@link #BitmapDrawableTranscoder(Resources)}, {@code bitmapPool} is unused.
30+
*/
2931
@Deprecated
3032
public BitmapDrawableTranscoder(
3133
@NonNull Resources resources, @SuppressWarnings("unused") BitmapPool bitmapPool) {

‎library/src/main/java/com/bumptech/glide/request/target/BitmapImageViewTarget.java

+3-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,9 @@ public BitmapImageViewTarget(ImageView view) {
1414
super(view);
1515
}
1616

17-
/** @deprecated Use {@link #waitForLayout()} instead. */
17+
/**
18+
* @deprecated Use {@link #waitForLayout()} instead.
19+
*/
1820
// Public API.
1921
@SuppressWarnings({"unused", "deprecation"})
2022
@Deprecated

‎library/src/main/java/com/bumptech/glide/request/target/BitmapThumbnailImageViewTarget.java

+3-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,9 @@ public BitmapThumbnailImageViewTarget(ImageView view) {
1515
super(view);
1616
}
1717

18-
/** @deprecated Use {@link #waitForLayout()} instead. */
18+
/**
19+
* @deprecated Use {@link #waitForLayout()} instead.
20+
*/
1921
@SuppressWarnings("deprecation")
2022
@Deprecated
2123
public BitmapThumbnailImageViewTarget(ImageView view, boolean waitForLayout) {

‎library/src/main/java/com/bumptech/glide/request/target/DrawableImageViewTarget.java

+3-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,9 @@ public DrawableImageViewTarget(ImageView view) {
1111
super(view);
1212
}
1313

14-
/** @deprecated Use {@link #waitForLayout()} instead. */
14+
/**
15+
* @deprecated Use {@link #waitForLayout()} instead.
16+
*/
1517
// Public API.
1618
@SuppressWarnings({"unused", "deprecation"})
1719
@Deprecated

‎library/src/main/java/com/bumptech/glide/request/target/DrawableThumbnailImageViewTarget.java

+3-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,9 @@ public DrawableThumbnailImageViewTarget(ImageView view) {
1313
super(view);
1414
}
1515

16-
/** @deprecated Use {@link #waitForLayout()} instead. */
16+
/**
17+
* @deprecated Use {@link #waitForLayout()} instead.
18+
*/
1719
@Deprecated
1820
@SuppressWarnings("deprecation")
1921
public DrawableThumbnailImageViewTarget(ImageView view, boolean waitForLayout) {

‎library/src/main/java/com/bumptech/glide/request/target/ImageViewTarget.java

+3-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,9 @@ public ImageViewTarget(ImageView view) {
2525
super(view);
2626
}
2727

28-
/** @deprecated Use {@link #waitForLayout()} instead. */
28+
/**
29+
* @deprecated Use {@link #waitForLayout()} instead.
30+
*/
2931
@SuppressWarnings({"deprecation"})
3032
@Deprecated
3133
public ImageViewTarget(ImageView view, boolean waitForLayout) {

‎library/src/main/java/com/bumptech/glide/request/target/ThumbnailImageViewTarget.java

+3-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,9 @@ public ThumbnailImageViewTarget(ImageView view) {
2727
super(view);
2828
}
2929

30-
/** @deprecated Use {@link #waitForLayout()} insetad. */
30+
/**
31+
* @deprecated Use {@link #waitForLayout()} insetad.
32+
*/
3133
@Deprecated
3234
@SuppressWarnings({"deprecation"})
3335
public ThumbnailImageViewTarget(ImageView view, boolean waitForLayout) {

‎library/src/main/java/com/bumptech/glide/request/transition/DrawableCrossFadeFactory.java

+3-1
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,9 @@ public Builder() {
5050
this(DEFAULT_DURATION_MS);
5151
}
5252

53-
/** @param durationMillis The duration of the cross fade animation in milliseconds. */
53+
/**
54+
* @param durationMillis The duration of the cross fade animation in milliseconds.
55+
*/
5456
public Builder(int durationMillis) {
5557
this.durationMillis = durationMillis;
5658
}

‎mocks/src/main/java/com/bumptech/glide/load/engine/executor/MockGlideExecutor.java

+3-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,9 @@ public static GlideExecutor newMainThreadExecutor() {
2727
return newTestExecutor(new DirectExecutorService());
2828
}
2929

30-
/** @deprecated Use {@link #newMainThreadExecutor} instead. */
30+
/**
31+
* @deprecated Use {@link #newMainThreadExecutor} instead.
32+
*/
3133
@Deprecated
3234
public static GlideExecutor newMainThreadUnlimitedExecutor() {
3335
return newMainThreadExecutor();

0 commit comments

Comments
 (0)
Please sign in to comment.