Skip to content

Commit 7120c79

Browse files
waterFallFlowwaterFallFlow
authored
Merge pull request #297 from BitPortal/rename_android_package
Rename android package
2 parents ee401e2 + 002fc50 commit 7120c79

File tree

52 files changed

+347
-126
lines changed

Some content is hidden

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

52 files changed

+347
-126
lines changed

‎android/app/.settings/org.eclipse.buildship.core.prefs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
#Sun Oct 14 14:53:15 CST 2018
1+
#Tue Nov 06 18:40:17 CST 2018
22
connection.project.dir=..

‎android/app/BUCK‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,12 +45,12 @@ android_library(
4545

4646
android_build_config(
4747
name = "build_config",
48-
package = "com.bitportal.wallet",
48+
package = "com.dexlize.bitportal",
4949
)
5050

5151
android_resource(
5252
name = "res",
53-
package = "com.bitportal.wallet",
53+
package = "com.dexlize.bitportal",
5454
res = "src/main/res",
5555
)
5656

‎android/app/build.gradle‎

Lines changed: 30 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -103,10 +103,10 @@ def enableProguardInReleaseBuilds = false
103103

104104
android {
105105
compileSdkVersion 27
106-
buildToolsVersion "27.0.3"
106+
buildToolsVersion '28.0.3'
107107

108108
defaultConfig {
109-
applicationId "com.bitportal.wallet"
109+
applicationId "com.dexlize.bitportal"
110110
minSdkVersion 21
111111
targetSdkVersion 27
112112
renderscriptTargetApi 27
@@ -116,7 +116,7 @@ android {
116116
versionCode 1
117117
versionName "0.4.1"
118118
manifestPlaceholders = [
119-
JPUSH_APPKEY: "05e8b10824ab700bae78e9eb",
119+
JPUSH_APPKEY: "5744130aa0487d3355a1a9ac",
120120
APP_CHANNEL : "default"
121121
]
122122

@@ -203,37 +203,36 @@ configurations.all {
203203

204204
dependencies {
205205
implementation project(':react-native-charts-wrapper')
206-
compile project(':react-native-fast-image')
207-
compile project(':react-native-fs')
208-
compile project(':jcore-react-native')
209-
compile project(':jpush-react-native')
210-
compile 'com.android.support:multidex:1.0.2'
211-
compile project(':react-native-qrcode-local-image')
212-
compile project(':react-native-image-crop-picker')
213-
compile project(':react-native-restart')
206+
implementation project(':react-native-fast-image')
207+
implementation project(':react-native-fs')
208+
implementation project(':jcore-react-native')
209+
implementation project(':jpush-react-native')
210+
implementation 'com.android.support:multidex:1.0.2'
211+
implementation project(':react-native-qrcode-local-image')
212+
implementation project(':react-native-image-crop-picker')
213+
implementation project(':react-native-restart')
214214
implementation fileTree(dir: "libs", include: ["*.jar"])
215-
implementation "com.android.support:appcompat-v7:25.4.0"
216215
implementation "com.facebook.react:react-native:+"
217216
implementation project(':react-native-navigation')
218-
compile project(':react-native-device-info')
219-
compile project(':react-native-version-number')
220-
compile project(':react-native-blur')
221-
compile project(':react-native-camera')
222-
compile project(':react-native-randombytes')
223-
compile project(':react-native-linear-gradient')
224-
compile project(':react-native-config')
225-
compile project(':react-native-sensitive-info')
226-
compile project(':react-native-splash-screen')
227-
compile project(':react-native-vector-icons')
228-
compile project(':react-native-navigation')
229-
compile project(':react-native-svg')
230-
compile project(':react-native-webview-bridge')
231-
compile fileTree(dir: "libs", include: ["*.jar"])
232-
compile "com.android.support:appcompat-v7:27.1.1"
233-
compile "com.android.support:support-v4:27.1.1"
234-
compile "com.android.support:animated-vector-drawable:27.1.1"
235-
compile "com.android.support:design:27.1.1"
236-
compile "com.facebook.react:react-native:0.20.1+" // From node_modules
217+
implementation project(':react-native-device-info')
218+
implementation project(':react-native-version-number')
219+
implementation project(':react-native-blur')
220+
implementation project(':react-native-camera')
221+
implementation project(':react-native-randombytes')
222+
implementation project(':react-native-linear-gradient')
223+
implementation project(':react-native-config')
224+
implementation project(':react-native-sensitive-info')
225+
implementation project(':react-native-splash-screen')
226+
implementation project(':react-native-vector-icons')
227+
implementation project(':react-native-navigation')
228+
implementation project(':react-native-svg')
229+
implementation project(':react-native-webview-bridge')
230+
implementation fileTree(dir: "libs", include: ["*.jar"])
231+
implementation "com.android.support:appcompat-v7:27.1.1"
232+
implementation "com.android.support:support-v4:27.1.1"
233+
implementation "com.android.support:animated-vector-drawable:27.1.1"
234+
implementation "com.android.support:design:27.1.1"
235+
implementation "com.facebook.react:react-native:0.20.1+" // From node_modules
237236
}
238237

239238
// Run this once to be able to run the application with BUCK

‎android/app/src/main/AndroidManifest.xml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
2-
package="com.bitportal.wallet"
2+
package="com.dexlize.bitportal"
33
android:versionCode="1"
44
android:versionName="0.4.1">
5-
<uses-sdk android:minSdkVersion="16" android:targetSdkVersion="22" />
5+
<uses-sdk android:targetSdkVersion="22" />
66

77
<uses-permission android:name="android.permission.INTERNET" />
88
<uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW"/>
@@ -16,8 +16,8 @@
1616
<uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
1717

1818
<!-- 极光 -->
19-
<permission android:name="com.bitportal.wallet.permission.JPUSH_MESSAGE" android:protectionLevel="signature" />
20-
<uses-permission android:name="com.bitportal.wallet.permission.JPUSH_MESSAGE" />
19+
<permission android:name="com.dexlize.bitportal.permission.JPUSH_MESSAGE" android:protectionLevel="signature" />
20+
<uses-permission android:name="com.dexlize.bitportal.permission.JPUSH_MESSAGE" />
2121
<uses-permission android:name="android.permission.MOUNT_UNMOUNT_FILESYSTEMS" />
2222
<uses-permission android:name="android.permission.WRITE_SETTINGS" />
2323

@@ -52,7 +52,7 @@
5252
</activity>
5353
<meta-data
5454
android:name="JPUSH_APPKEY"
55-
android:value="05e8b10824ab700bae78e9eb" />
55+
android:value="5744130aa0487d3355a1a9ac" />
5656
<meta-data
5757
android:name="JPUSH_CHANNEL"
5858
android:value="Android" />

android/app/src/main/java/com/bitportal/wallet/MainActivity.java renamed to android/app/src/main/java/com/dexlize/bitportal/MainActivity.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.bitportal.wallet;
1+
package com.dexlize.bitportal;
22
import android.os.Bundle;
33
import org.devio.rn.splashscreen.SplashScreen;
44

android/app/src/main/java/com/bitportal/wallet/MainApplication.java renamed to android/app/src/main/java/com/dexlize/bitportal/MainApplication.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.bitportal.wallet;
1+
package com.dexlize.bitportal;
22

33
import com.remobile.qrcodeLocalImage.RCTQRCodeLocalImagePackage;
44
import com.reactnative.ivpusic.imagepicker.PickerPackage;
@@ -20,11 +20,11 @@
2020
import com.reactnativenavigation.NavigationApplication;
2121
import com.reactnativenavigation.react.NavigationReactNativeHost;
2222
import com.reactnativenavigation.react.ReactGateway;
23-
import com.bitportal.wallet.core.BPCorePackage;
23+
import com.dexlize.bitportal.core.BPCorePackage;
2424
import com.umeng.commonsdk.UMConfigure;
25-
import com.bitportal.wallet.umeng.RNUMConfigure;
26-
import com.bitportal.wallet.umeng.DplusReactPackage;
27-
import com.bitportal.wallet.nativeutils.NativeUtilsPackage;
25+
import com.dexlize.bitportal.umeng.RNUMConfigure;
26+
import com.dexlize.bitportal.umeng.DplusReactPackage;
27+
import com.dexlize.bitportal.nativeutils.NativeUtilsPackage;
2828
import cn.jpush.reactnativejpush.JPushPackage;
2929
import cn.jpush.android.api.JPushInterface;
3030
import com.github.alinz.reactnativewebviewbridge.WebViewBridgePackage;

android/app/src/main/java/com/bitportal/wallet/core/BPCoreModule.java renamed to android/app/src/main/java/com/dexlize/bitportal/core/BPCoreModule.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.bitportal.wallet.core;
1+
package com.dexlize.bitportal.core;
22

33
import android.util.Log;
44

android/app/src/main/java/com/bitportal/wallet/core/BPCorePackage.java renamed to android/app/src/main/java/com/dexlize/bitportal/core/BPCorePackage.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.bitportal.wallet.core;
1+
package com.dexlize.bitportal.core;
22

33
import com.facebook.react.ReactPackage;
44
import com.facebook.react.bridge.NativeModule;

android/app/src/main/java/com/bitportal/wallet/nativeutils/NativeUtils.java renamed to android/app/src/main/java/com/dexlize/bitportal/nativeutils/NativeUtils.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.bitportal.wallet.nativeutils;
1+
package com.dexlize.bitportal.nativeutils;
22

33
import android.content.Context;
44
import android.app.Activity;

android/app/src/main/java/com/bitportal/wallet/nativeutils/NativeUtilsPackage.java renamed to android/app/src/main/java/com/dexlize/bitportal/nativeutils/NativeUtilsPackage.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
package com.bitportal.wallet.nativeutils;
1+
package com.dexlize.bitportal.nativeutils;
22

33
import com.facebook.react.ReactPackage;
44
import com.facebook.react.bridge.NativeModule;
55
import com.facebook.react.bridge.ReactApplicationContext;
66
import com.facebook.react.uimanager.ViewManager;
7-
import com.bitportal.wallet.nativeutils.NativeUtils;
7+
import com.dexlize.bitportal.nativeutils.NativeUtils;
88

99
import java.util.ArrayList;
1010
import java.util.Collections;

0 commit comments

Comments
 (0)