Move MockGlideExecutor into public 'mocks' package

Also eliminates one of the duplicate copies of the class. PiperOrigin-RevId: 267016311
bumptech · Sep 3, 2019 · e021f6b · e021f6b
1 parent 9fb1036
commit e021f6b
Show file tree

Hide file tree

Showing 9 changed files with 40 additions and 110 deletions.
diff --git a/glide/build.gradle b/glide/build.gradle
@@ -16,6 +16,7 @@ static def getAndroidPathsForJavadoc() {
             ':integration:okhttp3',
             ':integration:recyclerview',
             ':integration:volley',
+            ':mocks',
     ]
 }
 

diff --git a/instrumentation/build.gradle b/instrumentation/build.gradle
@@ -10,6 +10,7 @@ dependencies {
     implementation project(":library")
 
     androidTestImplementation project(':library')
+    androidTestImplementation project(':mocks')
     androidTestImplementation "org.mockito:mockito-android:${MOCKITO_ANDROID_VERSION}"
     androidTestImplementation "androidx.test.ext:junit:${ANDROIDX_TEST_VERSION}"
     androidTestImplementation "androidx.test:rules:${ANDROIDX_TEST_VERSION}"

diff --git a/library/test/build.gradle b/library/test/build.gradle
@@ -3,6 +3,7 @@ apply plugin: 'com.android.library'
 dependencies {
     testImplementation "androidx.appcompat:appcompat:${ANDROID_X_VERSION}"
     testImplementation project(':library')
+    testImplementation project(':mocks')
     testImplementation project(':testutil')
     testImplementation 'com.google.guava:guava-testlib:18.0'
     testImplementation "com.google.truth:truth:${TRUTH_VERSION}"

diff --git a/library/test/src/test/java/com/bumptech/glide/load/engine/executor/MockGlideExecutor.java b/library/test/src/test/java/com/bumptech/glide/load/engine/executor/MockGlideExecutor.java
diff --git a/mocks/build.gradle b/mocks/build.gradle
@@ -0,0 +1,25 @@
+apply plugin: 'com.android.library'
+
+dependencies {
+    implementation project(':library')
+    implementation "androidx.annotation:annotation:${ANDROID_X_VERSION}"
+    implementation "com.google.guava:guava:${GUAVA_VERSION}"
+}
+
+android {
+    compileSdkVersion COMPILE_SDK_VERSION as int
+
+    defaultConfig {
+        minSdkVersion MIN_SDK_VERSION as int
+        targetSdkVersion TARGET_SDK_VERSION as int
+
+        versionName = VERSION_NAME as String
+    }
+
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_7
+        targetCompatibility JavaVersion.VERSION_1_7
+    }
+}
+
+apply from: "${rootProject.projectDir}/scripts/upload.gradle"
diff --git a/mocks/gradle.properties b/mocks/gradle.properties
@@ -0,0 +1,7 @@
+POM_NAME=Glide mocks
+POM_ARTIFACT_ID=mocks
+POM_PACKAGING=aar
+POM_DESCRIPTION=A set of mocks to ease testing with Glide
+
+JAR_PREFIX=glide-
+JAR_POSTFIX=
diff --git a/mocks/src/main/AndroidManifest.xml b/mocks/src/main/AndroidManifest.xml
@@ -0,0 +1,4 @@
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+  package="com.bumptech.glide.mocks">
+  <application />
+</manifest>
diff --git a/...ad/engine/executor/MockGlideExecutor.java → ...ad/engine/executor/MockGlideExecutor.java b/...ad/engine/executor/MockGlideExecutor.java → ...ad/engine/executor/MockGlideExecutor.java
diff --git a/settings.gradle b/settings.gradle
@@ -27,5 +27,6 @@ include ':integration:okhttp3'
 include ':integration:recyclerview'
 include ':integration:volley'
 include ':testutil'
+include ':mocks'
 
 rootProject.name = 'glide-parent'