Skip to content

Commit b66b7fb

Browse files
TakayukiHoshi1984TakayukiHoshi1984
authored
Merge pull request #638 from TakayukiHoshi1984/modify_release_build
リリースビルド時の設定ファイル調整
2 parents 8e42c9f + f4b4166 commit b66b7fb

38 files changed

Lines changed: 62 additions & 55 deletions

‎dConnectDevicePlugin/dConnectDeviceHVCC2W/app/build.gradle‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,12 @@ android {
3939
signingConfig signingConfigs.releaseConfig
4040
}
4141
}
42-
42+
lintOptions {
43+
checkReleaseBuilds false
44+
// Or, if you prefer, you can continue to check for errors in release builds,
45+
// but continue the build even when errors are found:
46+
abortOnError false
47+
}
4348
packagingOptions {
4449
exclude 'LICENSE.txt'
4550
exclude 'META-INF/DEPENDENCIES'

‎dConnectDevicePlugin/dConnectDeviceHVCC2W/app/src/main/AndroidManifest.xml‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,7 @@
1515
android:icon="@mipmap/dconnect_icon"
1616
android:label="@string/app_name"
1717
android:supportsRtl="true"
18-
android:theme="@style/AppTheme"
19-
android:networkSecurityConfig="@xml/network_security_config">
18+
android:theme="@style/AppTheme">
2019

2120

2221
<receiver android:name="org.deviceconnect.android.deviceplugin.hvcc2w.HVCC2WDeviceServiceProvider" >

‎dConnectDevicePlugin/dConnectDeviceHVCC2W/app/src/main/res/xml/network_security_config.xml‎

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

‎dConnectDevicePlugin/dConnectDeviceLinking/app/src/main/AndroidManifest.xml‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<manifest
3-
package="org.deviceconnect.android.deviceplugin.linking"
3+
package="org.deviceconnect.android.deviceplugin.linking.lib"
44
xmlns:android="http://schemas.android.com/apk/res/android">
55

66
<application>
@@ -22,7 +22,7 @@
2222
android:value="true"/>
2323

2424
<receiver
25-
android:name=".LinkingDeviceProvider"
25+
android:name="org.deviceconnect.android.deviceplugin.linking.LinkingDeviceProvider"
2626
android:enabled="true"
2727
android:exported="true">
2828
<meta-data
@@ -32,7 +32,7 @@
3232
</receiver>
3333

3434
<service
35-
android:name=".LinkingDevicePluginService"
35+
android:name="org.deviceconnect.android.deviceplugin.linking.LinkingDevicePluginService"
3636
android:enabled="true"
3737
android:exported="true">
3838
<meta-data
@@ -41,7 +41,7 @@
4141
</service>
4242

4343
<activity
44-
android:name=".setting.SettingActivity"
44+
android:name="org.deviceconnect.android.deviceplugin.linking.setting.SettingActivity"
4545
android:configChanges="orientation|screenSize"
4646
android:label="@string/linking_app_name"
4747
android:launchMode="singleInstance"
@@ -52,47 +52,47 @@
5252
</activity>
5353

5454
<activity
55-
android:name=".setting.LinkingDeviceActivity"
55+
android:name="org.deviceconnect.android.deviceplugin.linking.setting.LinkingDeviceActivity"
5656
android:configChanges="orientation|screenSize"
5757
android:label="@string/linking_app_name"
5858
android:launchMode="singleInstance"
5959
android:theme="@style/LinkingTheme">
6060
</activity>
6161

6262
<activity
63-
android:name=".setting.LinkingBeaconActivity"
63+
android:name="org.deviceconnect.android.deviceplugin.linking.setting.LinkingBeaconActivity"
6464
android:configChanges="orientation|screenSize"
6565
android:label="@string/linking_app_name"
6666
android:launchMode="singleInstance"
6767
android:theme="@style/LinkingTheme">
6868
</activity>
6969

7070
<activity
71-
android:name=".setting.LinkingInductionActivity"
71+
android:name="org.deviceconnect.android.deviceplugin.linking.setting.LinkingInductionActivity"
7272
android:configChanges="orientation|screenSize"
7373
android:label="@string/linking_app_name"
7474
android:launchMode="singleInstance"
7575
android:theme="@style/LinkingTheme">
7676
</activity>
7777

7878
<activity
79-
android:name=".setting.LinkingHelpActivity"
79+
android:name="org.deviceconnect.android.deviceplugin.linking.setting.LinkingHelpActivity"
8080
android:configChanges="orientation|screenSize"
8181
android:label="@string/linking_app_name"
8282
android:launchMode="singleInstance"
8383
android:theme="@style/LinkingTheme">
8484
</activity>
8585

8686
<activity
87-
android:name=".setting.AppInformationActivity"
87+
android:name="org.deviceconnect.android.deviceplugin.linking.setting.AppInformationActivity"
8888
android:configChanges="orientation|screenSize"
8989
android:label="@string/linking_app_name"
9090
android:launchMode="singleInstance"
9191
android:theme="@style/LinkingTheme">
9292
</activity>
9393

9494
<activity
95-
android:name=".linking.ConfirmActivity"
95+
android:name="org.deviceconnect.android.deviceplugin.linking.linking.ConfirmActivity"
9696
android:configChanges="orientation|screenSize"
9797
android:excludeFromRecents="true"
9898
android:finishOnCloseSystemDialogs="true"

‎dConnectDevicePlugin/dConnectDeviceLinking/app/src/main/java/org/deviceconnect/android/deviceplugin/linking/LinkingApplication.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
import android.util.Log;
1313

1414
import org.deviceconnect.android.deviceplugin.linking.beacon.LinkingBeaconManager;
15+
import org.deviceconnect.android.deviceplugin.linking.lib.BuildConfig;
1516
import org.deviceconnect.android.deviceplugin.linking.linking.ConfirmActivity;
1617
import org.deviceconnect.android.deviceplugin.linking.linking.LinkingDeviceManager;
1718
import org.deviceconnect.android.event.EventManager;

‎dConnectDevicePlugin/dConnectDeviceLinking/app/src/main/java/org/deviceconnect/android/deviceplugin/linking/LinkingDevicePluginService.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
import org.deviceconnect.android.deviceplugin.linking.beacon.data.LinkingBeacon;
1818
import org.deviceconnect.android.deviceplugin.linking.beacon.profile.BeaconUtil;
1919
import org.deviceconnect.android.deviceplugin.linking.beacon.service.LinkingBeaconService;
20+
import org.deviceconnect.android.deviceplugin.linking.lib.BuildConfig;
2021
import org.deviceconnect.android.deviceplugin.linking.linking.LinkingDevice;
2122
import org.deviceconnect.android.deviceplugin.linking.linking.LinkingDeviceManager;
2223
import org.deviceconnect.android.deviceplugin.linking.linking.service.LinkingDeviceService;

‎dConnectDevicePlugin/dConnectDeviceLinking/app/src/main/java/org/deviceconnect/android/deviceplugin/linking/beacon/LinkingBeaconManager.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010
import android.content.Intent;
1111
import android.util.Log;
1212

13-
import org.deviceconnect.android.deviceplugin.linking.BuildConfig;
14-
import org.deviceconnect.android.deviceplugin.linking.R;
13+
import org.deviceconnect.android.deviceplugin.linking.lib.BuildConfig;
14+
import org.deviceconnect.android.deviceplugin.linking.lib.R;
1515
import org.deviceconnect.android.deviceplugin.linking.beacon.data.AtmosphericPressureData;
1616
import org.deviceconnect.android.deviceplugin.linking.beacon.data.BatteryData;
1717
import org.deviceconnect.android.deviceplugin.linking.beacon.data.ButtonData;

‎dConnectDevicePlugin/dConnectDeviceLinking/app/src/main/java/org/deviceconnect/android/deviceplugin/linking/beacon/LinkingDBAdapter.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@
1616
import android.text.TextUtils;
1717
import android.util.Log;
1818

19-
import org.deviceconnect.android.deviceplugin.linking.BuildConfig;
20-
import org.deviceconnect.android.deviceplugin.linking.R;
19+
import org.deviceconnect.android.deviceplugin.linking.lib.BuildConfig;
20+
import org.deviceconnect.android.deviceplugin.linking.lib.R;
2121
import org.deviceconnect.android.deviceplugin.linking.beacon.data.AtmosphericPressureData;
2222
import org.deviceconnect.android.deviceplugin.linking.beacon.data.BatteryData;
2323
import org.deviceconnect.android.deviceplugin.linking.beacon.data.GattData;

‎dConnectDevicePlugin/dConnectDeviceLinking/app/src/main/java/org/deviceconnect/android/deviceplugin/linking/beacon/profile/LinkingAtmosphericPressureProfile.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
import android.content.Intent;
1010
import android.util.Log;
1111

12-
import org.deviceconnect.android.deviceplugin.linking.BuildConfig;
12+
import org.deviceconnect.android.deviceplugin.linking.lib.BuildConfig;
1313
import org.deviceconnect.android.deviceplugin.linking.LinkingApplication;
1414
import org.deviceconnect.android.deviceplugin.linking.LinkingDevicePluginService;
1515
import org.deviceconnect.android.deviceplugin.linking.beacon.LinkingBeaconManager;

‎dConnectDevicePlugin/dConnectDeviceLinking/app/src/main/java/org/deviceconnect/android/deviceplugin/linking/beacon/profile/LinkingBatteryProfile.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
import android.os.Bundle;
1111
import android.util.Log;
1212

13-
import org.deviceconnect.android.deviceplugin.linking.BuildConfig;
13+
import org.deviceconnect.android.deviceplugin.linking.lib.BuildConfig;
1414
import org.deviceconnect.android.deviceplugin.linking.LinkingApplication;
1515
import org.deviceconnect.android.deviceplugin.linking.LinkingDevicePluginService;
1616
import org.deviceconnect.android.deviceplugin.linking.beacon.LinkingBeaconManager;

0 commit comments

Comments
 (0)