Skip to content

Commit 82824b5

Browse files
authoredNov 20, 2019
Delete deprecated "api" artifact (#197)
* Delete deprecated "api" artifact From now on, it's all on "android-test-core" and "android-test-runner", baby * Remove api project from Circle CI config * Remove api project from Gradle tasks
1 parent e50c8a0 commit 82824b5

File tree

20 files changed

+3
-1160
lines changed

20 files changed

+3
-1160
lines changed
 

‎.circleci/config.yml

+3-7
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ defaults: &defaults
77
GRADLE_OPTS: '-Dorg.gradle.jvmargs="-Xmx10248m -XX:MaxPermSize=256m -XX:+HeapDumpOnOutOfMemoryError"'
88

99
cache_key: &cache_key
10-
key: jars-{{ checksum "build.gradle.kts" }}-{{ checksum "plugin/android-junit5/build.gradle.kts" }}-{{ checksum "instrumentation/api/build.gradle.kts" }}-{{ checksum "instrumentation/runner/build.gradle.kts" }}-{{ checksum "instrumentation/sample/build.gradle.kts" }}-{{ checksum "gradle/wrapper/gradle-wrapper.properties" }}-{{ checksum "buildSrc/src/main/kotlin/Artifacts.kt" }}-{{ checksum "buildSrc/src/main/kotlin/Libs.kt" }}-{{ checksum "buildSrc/src/main/kotlin/Versions.kt" }}
10+
key: jars-{{ checksum "build.gradle.kts" }}-{{ checksum "plugin/android-junit5/build.gradle.kts" }}-{{ checksum "instrumentation/runner/build.gradle.kts" }}-{{ checksum "instrumentation/sample/build.gradle.kts" }}-{{ checksum "gradle/wrapper/gradle-wrapper.properties" }}-{{ checksum "buildSrc/src/main/kotlin/Artifacts.kt" }}-{{ checksum "buildSrc/src/main/kotlin/Libs.kt" }}-{{ checksum "buildSrc/src/main/kotlin/Versions.kt" }}
1111

1212
version: 2
1313
jobs:
@@ -51,13 +51,12 @@ jobs:
5151
name: (Instrumentation) Build
5252
command: |
5353
cd instrumentation
54-
./gradlew :api:assembleDebug \
55-
:core:assembleDebug :core:assembleDebugAndroidTest \
54+
./gradlew :core:assembleDebug :core:assembleDebugAndroidTest \
5655
:runner:assembleDebug \
5756
:sample:assembleDebug --stacktrace --no-daemon
5857
- run:
5958
name: (Instrumentation) Test
60-
command: cd instrumentation && ./gradlew :api:check :core:check :runner:check --stacktrace --no-daemon
59+
command: cd instrumentation && ./gradlew :core:check :runner:check --stacktrace --no-daemon
6160
- run:
6261
name: Store Google Service Account
6362
command: echo $GCLOUD_SERVICE_KEY > ${HOME}/gcloud-service-key.json
@@ -89,9 +88,6 @@ jobs:
8988
root: ~/root
9089
paths:
9190
- project
92-
- store_artifacts:
93-
path: instrumentation/api/build/reports
94-
destination: instrumentation-api
9591
- store_artifacts:
9692
path: instrumentation/core/build/reports
9793
destination: instrumentation-core

‎buildSrc/src/main/kotlin/Artifacts.kt

-10
Original file line numberDiff line numberDiff line change
@@ -49,16 +49,6 @@ object Artifacts {
4949
private val currentVersion = "1.2.0-SNAPSHOT"
5050
val latestStableVersion = "1.1.0"
5151

52-
val Library = Deployed(
53-
platform = Android(minSdk = 26),
54-
groupId = groupId,
55-
artifactId = "android-instrumentation-test",
56-
currentVersion = "0.3.0-SNAPSHOT",
57-
latestStableVersion = "0.2.2",
58-
license = license,
59-
description = "(DEPRECATED) Extensions for instrumented Android tests with JUnit 5."
60-
)
61-
6252
val Core = Deployed(
6353
platform = Android(minSdk = 14),
6454
groupId = groupId,

‎buildSrc/src/main/kotlin/Environment.kt

-1
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,4 @@ object Android {
77
const val sampleMinSdkVersion = 14
88
val testRunnerMinSdkVersion = (Artifacts.Instrumentation.Runner.platform as Platform.Android).minSdk
99
val testCoreMinSdkVersion = (Artifacts.Instrumentation.Core.platform as Platform.Android).minSdk
10-
val instrumentationMinSdkVersion = (Artifacts.Instrumentation.Library.platform as Platform.Android).minSdk
1110
}

‎instrumentation/api/build.gradle.kts

-114
This file was deleted.

‎instrumentation/api/src/androidTest/AndroidManifest.xml

-13
This file was deleted.

‎instrumentation/api/src/androidTest/kotlin/de/mannodermaus/junit5/test/ActivityTestIntegrationTests.kt

-117
This file was deleted.

‎instrumentation/api/src/androidTest/kotlin/de/mannodermaus/junit5/test/Extensions.kt

-11
This file was deleted.

‎instrumentation/api/src/androidTest/kotlin/de/mannodermaus/junit5/test/JavaInteropVerificationTests.java

-67
This file was deleted.

0 commit comments

Comments
 (0)