Skip to content

Commit cf0d625

Browse files
vinarmanivinarmani
authored
Merge pull request #263 from badger-cash/upgrade
Upgrade
2 parents 3adac96 + 0a48903 commit cf0d625

30 files changed

+6564
-3801
lines changed

‎.gitignore‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,8 @@ buck-out/
6262
**/app/*.keystore
6363
test_wallets.md
6464

65+
android/app/release/*
66+
6567
android/.gradle/*
6668
android/.idea/*
6769
android/local.properties

‎android/app/build.gradle‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ import com.android.build.OutputFile
1818
* // the entry file for bundle generation
1919
* entryFile: "index.android.js",
2020
*
21-
* // https://facebook.github.io/react-native/docs/performance#enable-the-ram-format
21+
* // https://reactnative.dev/docs/performance#enable-the-ram-format
2222
* bundleCommand: "ram-bundle",
2323
*
2424
* // whether to bundle JS and assets in debug mode
@@ -123,6 +123,8 @@ android {
123123
dexOptions {
124124
javaMaxHeapSize "4g"
125125
}
126+
127+
ndkVersion rootProject.ext.ndkVersion
126128

127129
compileSdkVersion rootProject.ext.compileSdkVersion
128130

@@ -135,8 +137,8 @@ android {
135137
applicationId "com.badgermobile"
136138
minSdkVersion rootProject.ext.minSdkVersion
137139
targetSdkVersion rootProject.ext.targetSdkVersion
138-
versionCode 9000021
139-
versionName "1.12.1"
140+
versionCode 9000024
141+
versionName "1.13.1"
140142
missingDimensionStrategy 'react-native-camera', 'general'
141143
}
142144
splits {
@@ -183,7 +185,7 @@ android {
183185
def abi = output.getFilter(OutputFile.ABI)
184186
if (abi != null) { // null for the universal-debug, universal-release variants
185187
output.versionCodeOverride =
186-
versionCodes.get(abi) * 1048576 + defaultConfig.versionCode
188+
defaultConfig.versionCode * 1000 + versionCodes.get(abi)
187189
}
188190
}
189191
}
@@ -192,6 +194,7 @@ android {
192194
dependencies {
193195
implementation fileTree(dir: "libs", include: ["*.jar"])
194196
implementation "com.facebook.react:react-native:+" // From node_modules
197+
implementation "androidx.swiperefreshlayout:swiperefreshlayout:1.0.0"
195198

196199
if (enableHermes) {
197200
def hermesPath = "../../node_modules/hermes-engine/android/";

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,7 @@
44

55
<uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW"/>
66

7-
<application tools:targetApi="28" tools:ignore="GoogleAppIndexingWarning" android:networkSecurityConfig="@xml/react_native_config" />
7+
<application tools:targetApi="28" tools:ignore="GoogleAppIndexingWarning" android:networkSecurityConfig="@xml/react_native_config" >
8+
<activity android:name="com.facebook.react.devsupport.DevSettingsActivity" />
9+
</application>
810
</manifest>

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,8 @@
1515
<activity
1616
android:name=".MainActivity"
1717
android:label="@string/app_name"
18-
android:configChanges="keyboard|keyboardHidden|orientation|screenSize"
18+
android:launchMode="singleTask"
19+
android:configChanges="keyboard|keyboardHidden|orientation|screenSize|uiMode"
1920
android:screenOrientation="portrait"
2021
android:windowSoftInputMode="adjustResize">
2122
<intent-filter>
@@ -35,7 +36,6 @@
3536
<data android:scheme="simpleledger" />
3637
</intent-filter>
3738
</activity>
38-
<activity android:name="com.facebook.react.devsupport.DevSettingsActivity" />
3939
</application>
4040

4141
</manifest>

‎android/app/src/main/res/values/styles.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<resources>
22

33
<!-- Base application theme. -->
4-
<style name="AppTheme" parent="Theme.AppCompat.Light.NoActionBar">
4+
<style name="AppTheme" parent="Theme.AppCompat.DayNight.NoActionBar">
55
<!-- Customize your theme here. -->
66
<item name="android:textColor">#000000</item>
77
</style>

‎android/build.gradle‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,18 @@
22

33
buildscript {
44
ext {
5-
buildToolsVersion = "28.0.3"
6-
minSdkVersion = 16
7-
compileSdkVersion = 28
8-
targetSdkVersion = 28
5+
buildToolsVersion = "29.0.3"
6+
minSdkVersion = 21
7+
compileSdkVersion = 29
8+
targetSdkVersion = 29
9+
ndkVersion = "20.1.5948944"
910
}
1011
repositories {
1112
google()
1213
jcenter()
1314
}
1415
dependencies {
15-
classpath 'com.android.tools.build:gradle:3.4.2'
16+
classpath('com.android.tools.build:gradle:4.2.0')
1617

1718
// NOTE: Do not place your application dependencies here; they belong
1819
// in the individual module build.gradle files
@@ -34,6 +35,6 @@ allprojects {
3435
}
3536
google()
3637
jcenter()
37-
maven { url 'https://jitpack.io' }
38+
maven { url 'https://www.jitpack.io' }
3839
}
3940
}

‎android/gradle.properties‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,5 +24,5 @@ org.gradle.jvmargs=-Xmx4608M
2424

2525
MYAPP_RELEASE_STORE_FILE=badger-mobile-release.keystore
2626
MYAPP_RELEASE_KEY_ALIAS=badger-mobile-release
27-
MYAPP_RELEASE_STORE_PASSWORD=*****
28-
MYAPP_RELEASE_KEY_PASSWORD=*****
27+
MYAPP_RELEASE_STORE_PASSWORD=android
28+
MYAPP_RELEASE_KEY_PASSWORD=android

‎android/gradle/wrapper/gradle-wrapper.properties‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
1+
#Sat Jun 06 16:28:58 ChST 2020
12
distributionBase=GRADLE_USER_HOME
23
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-5.5-all.zip
4+
distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-all.zip
45
zipStoreBase=GRADLE_USER_HOME
5-
zipStorePath=wrapper/dists
6+
zipStorePath=wrapper/dists

‎android/gradlew‎

Lines changed: 12 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -138,19 +138,19 @@ if $cygwin ; then
138138
else
139139
eval `echo args$i`="\"$arg\""
140140
fi
141-
i=$((i+1))
141+
i=`expr $i + 1`
142142
done
143143
case $i in
144-
(0) set -- ;;
145-
(1) set -- "$args0" ;;
146-
(2) set -- "$args0" "$args1" ;;
147-
(3) set -- "$args0" "$args1" "$args2" ;;
148-
(4) set -- "$args0" "$args1" "$args2" "$args3" ;;
149-
(5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
150-
(6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
151-
(7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
152-
(8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
153-
(9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
144+
0) set -- ;;
145+
1) set -- "$args0" ;;
146+
2) set -- "$args0" "$args1" ;;
147+
3) set -- "$args0" "$args1" "$args2" ;;
148+
4) set -- "$args0" "$args1" "$args2" "$args3" ;;
149+
5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
150+
6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
151+
7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
152+
8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
153+
9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
154154
esac
155155
fi
156156

@@ -159,14 +159,9 @@ save () {
159159
for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
160160
echo " "
161161
}
162-
APP_ARGS=$(save "$@")
162+
APP_ARGS=`save "$@"`
163163

164164
# Collect all arguments for the java command, following the shell quoting and substitution rules
165165
eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
166166

167-
# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
168-
if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
169-
cd "$(dirname "$0")"
170-
fi
171-
172167
exec "$JAVACMD" "$@"

‎android/gradlew.bat‎

Lines changed: 6 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,9 @@ if "%DIRNAME%" == "" set DIRNAME=.
1313
set APP_BASE_NAME=%~n0
1414
set APP_HOME=%DIRNAME%
1515

16+
@rem Resolve any "." and ".." in APP_HOME to make it shorter.
17+
for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
18+
1619
@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
1720
set DEFAULT_JVM_OPTS=
1821

@@ -21,7 +24,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome
2124

2225
set JAVA_EXE=java.exe
2326
%JAVA_EXE% -version >NUL 2>&1
24-
if "%ERRORLEVEL%" == "0" goto init
27+
if "%ERRORLEVEL%" == "0" goto execute
2528

2629
echo.
2730
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
@@ -35,7 +38,7 @@ goto fail
3538
set JAVA_HOME=%JAVA_HOME:"=%
3639
set JAVA_EXE=%JAVA_HOME%/bin/java.exe
3740

38-
if exist "%JAVA_EXE%" goto init
41+
if exist "%JAVA_EXE%" goto execute
3942

4043
echo.
4144
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
@@ -45,28 +48,13 @@ echo location of your Java installation.
4548

4649
goto fail
4750

48-
:init
49-
@rem Get command-line arguments, handling Windows variants
50-
51-
if not "%OS%" == "Windows_NT" goto win9xME_args
52-
53-
:win9xME_args
54-
@rem Slurp the command line arguments.
55-
set CMD_LINE_ARGS=
56-
set _SKIP=2
57-
58-
:win9xME_args_slurp
59-
if "x%~1" == "x" goto execute
60-
61-
set CMD_LINE_ARGS=%*
62-
6351
:execute
6452
@rem Setup the command line
6553

6654
set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
6755

6856
@rem Execute Gradle
69-
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
57+
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
7058

7159
:end
7260
@rem End local scope for the variables with windows NT shell

0 commit comments

Comments
 (0)