Skip to content

Delete deprecated "api" artifact #197

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Nov 20, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 3 additions & 7 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ defaults: &defaults
GRADLE_OPTS: '-Dorg.gradle.jvmargs="-Xmx10248m -XX:MaxPermSize=256m -XX:+HeapDumpOnOutOfMemoryError"'

cache_key: &cache_key
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" }}
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" }}

version: 2
jobs:
Expand Down Expand Up @@ -51,13 +51,12 @@ jobs:
name: (Instrumentation) Build
command: |
cd instrumentation
./gradlew :api:assembleDebug \
:core:assembleDebug :core:assembleDebugAndroidTest \
./gradlew :core:assembleDebug :core:assembleDebugAndroidTest \
:runner:assembleDebug \
:sample:assembleDebug --stacktrace --no-daemon
- run:
name: (Instrumentation) Test
command: cd instrumentation && ./gradlew :api:check :core:check :runner:check --stacktrace --no-daemon
command: cd instrumentation && ./gradlew :core:check :runner:check --stacktrace --no-daemon
- run:
name: Store Google Service Account
command: echo $GCLOUD_SERVICE_KEY > ${HOME}/gcloud-service-key.json
Expand Down Expand Up @@ -89,9 +88,6 @@ jobs:
root: ~/root
paths:
- project
- store_artifacts:
path: instrumentation/api/build/reports
destination: instrumentation-api
- store_artifacts:
path: instrumentation/core/build/reports
destination: instrumentation-core
Expand Down
10 changes: 0 additions & 10 deletions buildSrc/src/main/kotlin/Artifacts.kt
Original file line number Diff line number Diff line change
Expand Up @@ -49,16 +49,6 @@ object Artifacts {
private val currentVersion = "1.2.0-SNAPSHOT"
val latestStableVersion = "1.1.0"

val Library = Deployed(
platform = Android(minSdk = 26),
groupId = groupId,
artifactId = "android-instrumentation-test",
currentVersion = "0.3.0-SNAPSHOT",
latestStableVersion = "0.2.2",
license = license,
description = "(DEPRECATED) Extensions for instrumented Android tests with JUnit 5."
)

val Core = Deployed(
platform = Android(minSdk = 14),
groupId = groupId,
Expand Down
1 change: 0 additions & 1 deletion buildSrc/src/main/kotlin/Environment.kt
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,4 @@ object Android {
const val sampleMinSdkVersion = 14
val testRunnerMinSdkVersion = (Artifacts.Instrumentation.Runner.platform as Platform.Android).minSdk
val testCoreMinSdkVersion = (Artifacts.Instrumentation.Core.platform as Platform.Android).minSdk
val instrumentationMinSdkVersion = (Artifacts.Instrumentation.Library.platform as Platform.Android).minSdk
}
114 changes: 0 additions & 114 deletions instrumentation/api/build.gradle.kts

This file was deleted.

13 changes: 0 additions & 13 deletions instrumentation/api/src/androidTest/AndroidManifest.xml

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

Loading