Skip to content

Commit 6a232e3

Browse files
masaru-takanomasaru-takano
committed
master をマージ。
2 parents 96c8a1a + 01d553c commit 6a232e3

310 files changed

Lines changed: 640 additions & 23661 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎README.md‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -137,12 +137,8 @@ curl -X GET \
137137
|[dConnectDeviceHOGP](dConnectDevicePlugin/dConnectDeviceHOGP)|HOGPのデバイスプラグイン。|
138138
|[dConnectDeviceHost](dConnectDevicePlugin/dConnectDeviceHost)|Androidのデバイスプラグイン。|
139139
|[dConnectDeviceHue](dConnectDevicePlugin/dConnectDeviceHue)|Hueのデバイスプラグイン。|
140-
|[dConnectDeviceHVC](dConnectDevicePlugin/dConnectDeviceHVC)|HVC-Cのデバイスプラグイン。|
141-
|[dConnectDeviceHVCC2W](dConnectDevicePlugin/dConnectDeviceHVCC2W)|HVC-C2Wのデバイスプラグイン。|
142-
|[dConnectDeviceHVCP](dConnectDevicePlugin/dConnectDeviceHVCP)|HVC-Pのデバイスプラグイン。|
143140
|[dConnectDeviceIRKit](dConnectDevicePlugin/dConnectDeviceIRKit)|IRKitのデバイスプラグイン。|
144141
|[dConnectDeviceLinking](dConnectDevicePlugin/dConnectDeviceLinking)|Linkingのデバイスプラグイン。|
145-
|[dConnectDeviceSphero](dConnectDevicePlugin/dConnectDeviceSphero)|Spheroのデバイスプラグイン。|
146142
|[dConnectDeviceSwitchBot](dConnectDevicePlugin/dConnectDeviceSwitchBot)|SwitchBotのデバイスプラグイン。|
147143
|[dConnectDeviceTheta](dConnectDevicePlugin/dConnectDeviceTheta)|THETAのデバイスプラグイン。|
148144
|[dConnectDeviceUVC](dConnectDevicePlugin/dConnectDeviceUVC)|UVCカメラのデバイスプラグイン。|
@@ -221,12 +217,8 @@ Device Connect Managerや各デバイスプラグインを開発したい人は
221217
* [HOGP](https://github.com/DeviceConnect/DeviceConnect-Android/wiki/HOGP-Build)
222218
* [Host](https://github.com/DeviceConnect/DeviceConnect-Android/wiki/Host-Build)
223219
* [Hue](https://github.com/DeviceConnect/DeviceConnect-Android/wiki/Hue-Build)
224-
* [HVC](https://github.com/DeviceConnect/DeviceConnect-Android/wiki/HVCDevice-Build)
225-
* [HVC-C2W](https://github.com/DeviceConnect/DeviceConnect-Android/wiki/HVCC2WDevice-Build)
226-
* [HVC-P](https://github.com/DeviceConnect/DeviceConnect-Android/wiki/HVCPDevice-Build)
227220
* [IRKit](https://github.com/DeviceConnect/DeviceConnect-Android/wiki/IRKit-Build)
228221
* [Linking](https://github.com/DeviceConnect/DeviceConnect-Android/wiki/Linking-Build)
229-
* [Sphero](https://github.com/DeviceConnect/DeviceConnect-Android/wiki/Sphero-Build)
230222
* [SwitchBot](https://github.com/DeviceConnect/DeviceConnect-Android/wiki/SwitchBot-Build)
231223
* [Theta](https://github.com/DeviceConnect/DeviceConnect-Android/wiki/Theta-Build)
232224
* [UVC](https://github.com/DeviceConnect/DeviceConnect-Android/wiki/UVC-Build)

‎dConnectDevicePlugin/dConnectDeviceAndroidWear/app/build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ repositories {
88

99
dependencies {
1010
implementation fileTree(include: '*.jar', dir: 'libs')
11-
implementation 'org.deviceconnect:dconnect-device-plugin-sdk:2.8.1'
11+
implementation 'org.deviceconnect:dconnect-device-plugin-sdk:2.8.3'
1212
implementation 'androidx.multidex:multidex:2.0.1'
1313
implementation 'com.google.android.gms:play-services-wearable:17.0.0'
1414

‎dConnectDevicePlugin/dConnectDeviceAndroidWear/wear-app/build.gradle‎

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -47,14 +47,4 @@ dependencies {
4747
compileOnly 'com.google.android.wearable:wearable:2.5.0'
4848

4949
implementation 'com.google.android.gms:play-services-wearable:17.0.0'
50-
}
51-
configurations.all {
52-
resolutionStrategy.eachDependency { DependencyResolveDetails details ->
53-
def requested = details.requested
54-
if (requested.group == 'com.android.support') {
55-
if (!requested.name.startsWith("multidex")) {
56-
details.useVersion '27.1.1'
57-
}
58-
}
59-
}
6050
}

‎dConnectDevicePlugin/dConnectDeviceChromeCast/app/build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ repositories {
6363

6464
dependencies {
6565
implementation fileTree(include: '*.jar', dir: 'libs')
66-
implementation 'org.deviceconnect:dconnect-device-plugin-sdk:2.8.1'
66+
implementation 'org.deviceconnect:dconnect-device-plugin-sdk:2.8.3'
6767
implementation 'com.google.android.gms:play-services-cast-framework:17.1.0'
6868
}
6969

‎dConnectDevicePlugin/dConnectDeviceFaBo/app/build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ repositories {
5656

5757
dependencies {
5858
implementation fileTree(include: '*.jar', dir: 'libs')
59-
api 'org.deviceconnect:dconnect-device-plugin-sdk:2.8.1'
59+
api 'org.deviceconnect:dconnect-device-plugin-sdk:2.8.3'
6060
testImplementation 'junit:junit:4.12'
6161
androidTestImplementation 'androidx.test.ext:junit:1.1.1'
6262
androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'

‎dConnectDevicePlugin/dConnectDeviceHOGP/plugin/build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ apply plugin: 'com.android.application'
22

33
dependencies {
44
implementation fileTree(include: '*.jar', dir: 'libs')
5-
implementation 'org.deviceconnect:dconnect-device-plugin-sdk:2.8.1'
5+
implementation 'org.deviceconnect:dconnect-device-plugin-sdk:2.8.3'
66
}
77

88
repositories {

‎dConnectDevicePlugin/dConnectDeviceHVC/LICENSE.TXT‎

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

‎dConnectDevicePlugin/dConnectDeviceHVC/NOTICE.TXT‎

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

‎dConnectDevicePlugin/dConnectDeviceHVC/README.md‎

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

‎dConnectDevicePlugin/dConnectDeviceHVC/app/build.gradle‎

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

0 commit comments

Comments
 (0)