Skip to content

Commit 1bf7ffe

Browse files
committed
Remove driver-embedded-android
JAVA-3324
1 parent c6d95b7 commit 1bf7ffe

17 files changed

+6
-1632
lines changed

.evergreen/.evg.yml

Lines changed: 0 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -121,26 +121,6 @@ functions:
121121
permissions: public-read
122122
content_type: ${content_type|application/x-gzip}
123123

124-
"upload android logs":
125-
# Compress and upload the entire build directory
126-
- command: archive.targz_pack
127-
params:
128-
# Example: mongo_c_driver_releng_9dfb7d741efbca16faa7859b9349d7a942273e43_16_11_08_19_29_52.tar.gz
129-
target: "${build_id}.tar.gz"
130-
source_dir: ${PROJECT_DIRECTORY}/.android/download_logs
131-
include:
132-
- "./**"
133-
- command: s3.put
134-
params:
135-
aws_key: ${aws_key}
136-
aws_secret: ${aws_secret}
137-
local_file: ${build_id}.tar.gz
138-
# Example: /mciuploads/${UPLOAD_BUCKET}/gcc49/9dfb7d741efbca16faa7859b9349d7a942273e43/debug-compile-nosasl-nossl/mongo_c_driver_releng_9dfb7d741efbca16faa7859b9349d7a942273e43_16_11_08_19_29_52.tar.gz
139-
remote_file: ${UPLOAD_BUCKET}/${build_variant}/${revision}/${task_name}/${build_id}.tar.gz
140-
bucket: mciuploads
141-
permissions: public-read
142-
content_type: ${content_type|application/x-gzip}
143-
144124
"exec script" :
145125
- command: shell.exec
146126
type: test
@@ -215,9 +195,6 @@ functions:
215195
- command: attach.xunit_results
216196
params:
217197
file: ./src/*/build/test-results/test/TEST-*.xml
218-
- command: attach.xunit_results
219-
params:
220-
file: ./src/*/build/outputs/androidTest-results/connected/TEST-*.xml
221198

222199
"bootstrap mongo-orchestration":
223200
- command: shell.exec
@@ -266,15 +243,6 @@ functions:
266243
${PREPARE_SHELL}
267244
JDK="${JDK}" .evergreen/run-embedded-tests.sh
268245
269-
"run embedded tests android":
270-
- command: shell.exec
271-
type: test
272-
params:
273-
working_dir: "src"
274-
script: |
275-
${PREPARE_SHELL}
276-
.evergreen/run-embedded-tests-android.sh
277-
278246
"run plain auth test":
279247
- command: shell.exec
280248
type: test
@@ -438,11 +406,6 @@ tasks:
438406
commands:
439407
- func: "run embedded tests"
440408

441-
- name: "embedded-test-android"
442-
commands:
443-
# - func: "run embedded tests android"
444-
# - func: "upload android logs"
445-
446409
- name: "atlas-test"
447410
commands:
448411
- func: "run atlas test"
@@ -461,8 +424,6 @@ tasks:
461424
name: "plain-auth-test"
462425
- variant: ".test-embedded-variant"
463426
name: "embedded-test"
464-
- variant: "embedded-test-android"
465-
name: "embedded-test-android"
466427
commands:
467428
- func: "publish snapshot"
468429

@@ -710,12 +671,6 @@ buildvariants:
710671
tasks:
711672
- name: "embedded-test"
712673

713-
- name: embedded-test-android
714-
display_name: "Embedded: Android"
715-
run_on: ubuntu1804-test
716-
tasks:
717-
- name: "embedded-test-android"
718-
719674
- name: plain-auth-test
720675
display_name: "PLAIN (LDAP) Auth test"
721676
run_on: *hosts

.evergreen/publish.sh

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -20,23 +20,6 @@ export ORG_GRADLE_PROJECT_signing_keyId=${SIGNING_KEY_ID}
2020
export ORG_GRADLE_PROJECT_signing_password=${SIGNING_PASSWORD}
2121
export ORG_GRADLE_PROJECT_signing_secretKeyRingFile=${PROJECT_DIRECTORY}/secring.gpg
2222

23-
SDK_ROOT=$PWD/android_sdk
24-
if [ ! -e $SDK_ROOT ]; then
25-
echo "Installing ANDROID SDK"
26-
mkdir $SDK_ROOT
27-
(
28-
cd $SDK_ROOT
29-
export JAVA_HOME="/opt/java/jdk8"
30-
SDK_PACKAGE=sdk-tools-linux-4333796.zip
31-
curl -O https://dl.google.com/android/repository/$SDK_PACKAGE
32-
unzip $SDK_PACKAGE
33-
yes | ./tools/bin/sdkmanager --channel=0 \
34-
"platforms;android-28" \
35-
"build-tools;28.0.0"
36-
)
37-
fi
38-
export ANDROID_HOME=${SDK_ROOT}
39-
4023
echo "Publishing snapshot with jdk9"
4124
export JAVA_HOME="/opt/java/jdk9"
4225

.evergreen/run-embedded-tests-android.sh

Lines changed: 0 additions & 93 deletions
This file was deleted.

.gitignore

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,6 @@ atlassian-ide-plugin.xml
2828
# gradle
2929
.gradle
3030

31-
# android
32-
.android/
33-
android/
34-
3531
# code review
3632
codereview.rc
3733

build.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,9 +48,9 @@ ext {
4848

4949
def configDir = ext.configDir
5050
def coreProjects = subprojects.findAll { !['util'].contains(it.name) }
51-
def javaProjects = subprojects.findAll { !['driver-embedded-android'].contains(it.name) }
52-
def javaMainProjects = subprojects.findAll { !['util', 'driver-embedded-android'].contains(it.name) }
53-
def javaCodeCheckedProjects = subprojects.findAll { !['util', 'mongo-java-driver', 'driver-embedded-android', 'driver-benchmarks'].contains(it.name) }
51+
def javaProjects = subprojects
52+
def javaMainProjects = subprojects.findAll { !['util'].contains(it.name) }
53+
def javaCodeCheckedProjects = subprojects.findAll { !['util', 'mongo-java-driver', 'driver-benchmarks'].contains(it.name) }
5454

5555
configure(coreProjects) {
5656
evaluationDependsOn(':util')

driver-embedded-android/AndroidManifest.xml

Lines changed: 0 additions & 2 deletions
This file was deleted.

driver-embedded-android/build.gradle

Lines changed: 0 additions & 133 deletions
This file was deleted.

0 commit comments

Comments
 (0)