Skip to content
This repository has been archived by the owner on Aug 8, 2023. It is now read-only.

Remove wear module from project #9618

Merged
merged 1 commit into from
Jul 27, 2017
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
13 changes: 0 additions & 13 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -580,13 +580,6 @@ run-android-unit-test: platform/android/configuration.gradle
run-android-unit-test-%: platform/android/configuration.gradle
cd platform/android && $(MBGL_ANDROID_GRADLE) -Pmapbox.abis=none :MapboxGLAndroidSDKTestApp:testDebugUnitTest --tests "$*"

# Run Java Unit tests on the JVM of the machine executing this
.PHONY: run-android-wear-unit-test
run-android-wear-unit-test: platform/android/configuration.gradle
cd platform/android && $(MBGL_ANDROID_GRADLE) -Pmapbox.abis=none :MapboxGLAndroidSDKWearTestApp:testDebugUnitTest
run-android-wear-unit-test-%: platform/android/configuration.gradle
cd platform/android && $(MBGL_ANDROID_GRADLE) -Pmapbox.abis=none :MapboxGLAndroidSDKWearTestApp:testDebugUnitTest --tests "$*"

# Run Instrumentation tests on AWS device farm, requires additional authentication through gradle.properties
.PHONY: run-android-ui-test-aws
run-android-ui-test-aws: platform/android/configuration.gradle
Expand Down Expand Up @@ -632,11 +625,6 @@ android-lint-sdk: platform/android/configuration.gradle
android-lint-test-app: platform/android/configuration.gradle
cd platform/android && $(MBGL_ANDROID_GRADLE) -Pmapbox.abis=none :MapboxGLAndroidSDKTestApp:lint

# Runs lint on the Android wear test app code
.PHONY: android-lint-wear-app
android-lint-wear-app: platform/android/configuration.gradle
cd platform/android && $(MBGL_ANDROID_GRADLE) -Pmapbox.abis=none :MapboxGLAndroidSDKWearTestApp:lint

# Generates javadoc from the Android SDK
.PHONY: android-javadoc
android-javadoc: platform/android/configuration.gradle
Expand Down Expand Up @@ -672,7 +660,6 @@ clean:
./platform/android/MapboxGLAndroidSDK/build \
./platform/android/MapboxGLAndroidSDK/.externalNativeBuild \
./platform/android/MapboxGLAndroidSDKTestApp/build \
./platform/android/MapboxGLAndroidSDKWearTestApp/build \
./platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/activity/gen \
./platform/android/MapboxGLAndroidSDK/src/main/assets

Expand Down
13 changes: 0 additions & 13 deletions circle.yml
Original file line number Diff line number Diff line change
Expand Up @@ -167,9 +167,6 @@ jobs:
- run:
name: Test phone module
command: make run-android-unit-test
- run:
name: Test wear module
command: make run-android-wear-unit-test
- run:
name: Generate Espresso sanity tests
command: make test-code-android
Expand All @@ -184,10 +181,6 @@ jobs:
name: Check Android modules for potential bugs (Lint Test App)
command: |
make android-lint-test-app
- run:
name: Check Android modules for potential bugs (Lint Wear Test App)
command: |
make android-lint-wear-app
- run:
name: Build Test APK
command: |
Expand Down Expand Up @@ -238,12 +231,6 @@ jobs:
path: platform/android/MapboxGLAndroidSDKTestApp/build/reports/lint-results.xml
- store_artifacts:
path: platform/android/MapboxGLAndroidSDKTestApp/lint-baseline.xml
- store_artifacts:
path: platform/android/MapboxGLAndroidSDKWearTestApp/build/reports/lint-results.html
- store_artifacts:
path: platform/android/MapboxGLAndroidSDKWearTestApp/build/reports/lint-results.xml
- store_artifacts:
path: platform/android/MapboxGLAndroidSDKWearTestApp/lint-baseline.xml

# ------------------------------------------------------------------------------
android-release-all:
Expand Down
1 change: 0 additions & 1 deletion platform/android/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ local.properties

# Token file
MapboxGLAndroidSDKTestApp/src/main/res/values/developer-config.xml
MapboxGLAndroidSDKWearTestApp/src/main/res/values/developer-config.xml

# Twitter Fabric / Crashlytics
fabric.properties
Expand Down
2 changes: 0 additions & 2 deletions platform/android/MapboxGLAndroidSDKWearTestApp/.gitignore

This file was deleted.

52 changes: 0 additions & 52 deletions platform/android/MapboxGLAndroidSDKWearTestApp/build.gradle

This file was deleted.

This file was deleted.

This file was deleted.

Loading