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

Commit 7cdcfe2

Browse files
committed
[android] - remove wear module from project
1 parent 48481db commit 7cdcfe2

28 files changed

+1
-1433
lines changed

Makefile

-13
Original file line numberDiff line numberDiff line change
@@ -580,13 +580,6 @@ run-android-unit-test: platform/android/configuration.gradle
580580
run-android-unit-test-%: platform/android/configuration.gradle
581581
cd platform/android && $(MBGL_ANDROID_GRADLE) -Pmapbox.abis=none :MapboxGLAndroidSDKTestApp:testDebugUnitTest --tests "$*"
582582

583-
# Run Java Unit tests on the JVM of the machine executing this
584-
.PHONY: run-android-wear-unit-test
585-
run-android-wear-unit-test: platform/android/configuration.gradle
586-
cd platform/android && $(MBGL_ANDROID_GRADLE) -Pmapbox.abis=none :MapboxGLAndroidSDKWearTestApp:testDebugUnitTest
587-
run-android-wear-unit-test-%: platform/android/configuration.gradle
588-
cd platform/android && $(MBGL_ANDROID_GRADLE) -Pmapbox.abis=none :MapboxGLAndroidSDKWearTestApp:testDebugUnitTest --tests "$*"
589-
590583
# Run Instrumentation tests on AWS device farm, requires additional authentication through gradle.properties
591584
.PHONY: run-android-ui-test-aws
592585
run-android-ui-test-aws: platform/android/configuration.gradle
@@ -632,11 +625,6 @@ android-lint-sdk: platform/android/configuration.gradle
632625
android-lint-test-app: platform/android/configuration.gradle
633626
cd platform/android && $(MBGL_ANDROID_GRADLE) -Pmapbox.abis=none :MapboxGLAndroidSDKTestApp:lint
634627

635-
# Runs lint on the Android wear test app code
636-
.PHONY: android-lint-wear-app
637-
android-lint-wear-app: platform/android/configuration.gradle
638-
cd platform/android && $(MBGL_ANDROID_GRADLE) -Pmapbox.abis=none :MapboxGLAndroidSDKWearTestApp:lint
639-
640628
# Generates javadoc from the Android SDK
641629
.PHONY: android-javadoc
642630
android-javadoc: platform/android/configuration.gradle
@@ -672,7 +660,6 @@ clean:
672660
./platform/android/MapboxGLAndroidSDK/build \
673661
./platform/android/MapboxGLAndroidSDK/.externalNativeBuild \
674662
./platform/android/MapboxGLAndroidSDKTestApp/build \
675-
./platform/android/MapboxGLAndroidSDKWearTestApp/build \
676663
./platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/activity/gen \
677664
./platform/android/MapboxGLAndroidSDK/src/main/assets
678665

circle.yml

-13
Original file line numberDiff line numberDiff line change
@@ -167,9 +167,6 @@ jobs:
167167
- run:
168168
name: Test phone module
169169
command: make run-android-unit-test
170-
- run:
171-
name: Test wear module
172-
command: make run-android-wear-unit-test
173170
- run:
174171
name: Generate Espresso sanity tests
175172
command: make test-code-android
@@ -184,10 +181,6 @@ jobs:
184181
name: Check Android modules for potential bugs (Lint Test App)
185182
command: |
186183
make android-lint-test-app
187-
- run:
188-
name: Check Android modules for potential bugs (Lint Wear Test App)
189-
command: |
190-
make android-lint-wear-app
191184
- run:
192185
name: Build Test APK
193186
command: |
@@ -238,12 +231,6 @@ jobs:
238231
path: platform/android/MapboxGLAndroidSDKTestApp/build/reports/lint-results.xml
239232
- store_artifacts:
240233
path: platform/android/MapboxGLAndroidSDKTestApp/lint-baseline.xml
241-
- store_artifacts:
242-
path: platform/android/MapboxGLAndroidSDKWearTestApp/build/reports/lint-results.html
243-
- store_artifacts:
244-
path: platform/android/MapboxGLAndroidSDKWearTestApp/build/reports/lint-results.xml
245-
- store_artifacts:
246-
path: platform/android/MapboxGLAndroidSDKWearTestApp/lint-baseline.xml
247234

248235
# ------------------------------------------------------------------------------
249236
android-release-all:

platform/android/.gitignore

-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ local.properties
2020

2121
# Token file
2222
MapboxGLAndroidSDKTestApp/src/main/res/values/developer-config.xml
23-
MapboxGLAndroidSDKWearTestApp/src/main/res/values/developer-config.xml
2423

2524
# Twitter Fabric / Crashlytics
2625
fabric.properties

platform/android/MapboxGLAndroidSDKWearTestApp/.gitignore

-2
This file was deleted.

platform/android/MapboxGLAndroidSDKWearTestApp/build.gradle

-52
This file was deleted.

platform/android/MapboxGLAndroidSDKWearTestApp/gradle-checkstyle.gradle

-17
This file was deleted.

platform/android/MapboxGLAndroidSDKWearTestApp/gradle-config.gradle

-22
This file was deleted.

0 commit comments

Comments
 (0)