Skip to content

Commit 2573b0b

Browse files
committed
Revert "一時的にプラグインSDKをプロジェクトとして参照。"
This reverts commit 269ffe8.
1 parent 596b829 commit 2573b0b

5 files changed

Lines changed: 4 additions & 24 deletions

File tree

dConnectDevicePlugin/dConnectDeviceHost/app/build.gradle

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -72,11 +72,7 @@ repositories {
7272

7373
dependencies {
7474
implementation fileTree(include: '*.jar', dir: 'libs')
75-
76-
//implementation 'org.deviceconnect:dconnect-device-plugin-sdk:2.8.1'
77-
implementation project(':dconnect-device-plugin-sdk')
78-
implementation project(':dconnect-sdk-for-android')
79-
75+
implementation 'org.deviceconnect:dconnect-device-plugin-sdk:2.8.1'
8076
implementation project(':dconnect-demo-lib')
8177
implementation project(':libstreaming')
8278
implementation('com.serenegiant:common:2.12.5') {

dConnectDevicePlugin/dConnectDevicePluginSDK/dconnect-device-plugin-sdk/build.gradle

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -77,10 +77,7 @@ repositories {
7777

7878
dependencies {
7979
implementation fileTree(include: '*.jar', dir: 'libs')
80-
81-
//implementation 'org.deviceconnect:dconnect-sdk-for-android:2.3.2'
82-
implementation project(':dconnect-sdk-for-android')
83-
80+
implementation 'org.deviceconnect:dconnect-sdk-for-android:2.3.2'
8481
implementation 'androidx.legacy:legacy-support-v4:1.0.0'
8582
implementation 'org.bouncycastle:bcprov-jdk15on:1.46'
8683

dConnectManager/dConnectManager/dconnect-manager-app/build.gradle

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -78,11 +78,7 @@ repositories {
7878
dependencies {
7979
implementation fileTree(include: '*.jar', dir: 'libs')
8080
implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
81-
82-
//implementation 'org.deviceconnect:dconnect-device-plugin-sdk:2.8.1'
83-
implementation project(':dconnect-device-plugin-sdk')
84-
implementation project(':dconnect-sdk-for-android')
85-
81+
implementation 'org.deviceconnect:dconnect-device-plugin-sdk:2.8.1'
8682
implementation project(':dconnect-manager-core')
8783
implementation project(':dconnect-server-nano-httpd')
8884
implementation project(':dconnect-device-plugin-host')

dConnectManager/dConnectManager/dconnect-manager-core/build.gradle

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,12 +26,7 @@ repositories {
2626

2727
dependencies {
2828
implementation fileTree(dir: 'libs', include: ['*.jar'])
29-
30-
//implementation 'org.deviceconnect:dconnect-device-plugin-sdk:2.8.1'
31-
implementation project(':dconnect-device-plugin-sdk')
32-
implementation project(':dconnect-sdk-for-android')
33-
implementation 'androidx.legacy:legacy-support-v4:1.0.0'
34-
29+
implementation 'org.deviceconnect:dconnect-device-plugin-sdk:2.8.1'
3530
implementation project(':dconnect-server-nano-httpd')
3631

3732
testImplementation 'junit:junit:4.12'

dConnectManager/dConnectManager/settings.gradle

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,6 @@ include 'dconnect-server'
33
project(':dconnect-server').projectDir = new File('../dConnectServer')
44
include 'dconnect-server-nano-httpd'
55
project(':dconnect-server-nano-httpd').projectDir = new File('../dConnectServerNanoHttpd/nanohttpd')
6-
include 'dconnect-sdk-for-android'
7-
project(':dconnect-sdk-for-android').projectDir = new File('../../dConnectSDK/dConnectSDKForAndroid/dconnect-sdk-for-android')
8-
include 'dconnect-device-plugin-sdk'
9-
project(':dconnect-device-plugin-sdk').projectDir = new File('../../dConnectDevicePlugin/dConnectDevicePluginSDK/dconnect-device-plugin-sdk')
106
include 'dconnect-device-plugin-host'
117
project(':dconnect-device-plugin-host').projectDir = new File('../../dConnectDevicePlugin/dConnectDeviceHost/app')
128
include 'libstreaming'

0 commit comments

Comments
 (0)