Skip to content

Commit 12051aa

Browse files
hayzamjshayzamjs
authored
Merge pull request #8 from scala-network/v8-update
update: libs and references for v8
2 parents 618b2a4 + 762f507 commit 12051aa

File tree

283 files changed

+1487
-508
lines changed

Some content is hidden

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

283 files changed

+1487
-508
lines changed

‎app.json‎

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -4,23 +4,15 @@
44
"port": "11812"
55
},
66
{
7-
"host": "mine.scalaproject.io",
8-
"port": "8000"
9-
},
10-
{
11-
"host": "scalanode.com",
12-
"port": "11812"
13-
},
14-
{
15-
"host": "XLAnode.com",
7+
"host": "remote.two.scalaproject.io",
168
"port": "11812"
179
},
1810
{
19-
"host": "scala.ethospool.org",
11+
"host": "scala.fastnode.eu",
2012
"port": "11812"
2113
},
2214
{
23-
"host": "daemon.pool.gntl.co.uk",
15+
"host": "164.68.115.234",
2416
"port": "11812"
2517
}
2618
]

‎app/CMakeLists.txt‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ add_library( monerujo
77

88
set(EXTERNAL_LIBS_DIR ${CMAKE_SOURCE_DIR}/../external-libs)
99

10+
1011
############
1112
# libsodium
1213
############
@@ -159,6 +160,10 @@ add_library(hardforks STATIC IMPORTED)
159160
set_target_properties(hardforks PROPERTIES IMPORTED_LOCATION
160161
${EXTERNAL_LIBS_DIR}/scala/lib/${ANDROID_ABI}/libhardforks.a)
161162

163+
add_library(felidae STATIC IMPORTED)
164+
set_target_properties(felidae PROPERTIES IMPORTED_LOCATION
165+
${EXTERNAL_LIBS_DIR}/scala/lib/${ANDROID_ABI}/libfelidae.a)
166+
162167
add_library(randomx STATIC IMPORTED)
163168
set_target_properties(randomx PROPERTIES IMPORTED_LOCATION
164169
${EXTERNAL_LIBS_DIR}/scala/lib/${ANDROID_ABI}/librandomx.a)
@@ -167,6 +172,14 @@ add_library(rpc_base STATIC IMPORTED)
167172
set_target_properties(rpc_base PROPERTIES IMPORTED_LOCATION
168173
${EXTERNAL_LIBS_DIR}/scala/lib/${ANDROID_ABI}/librpc_base.a)
169174

175+
add_library(wallet-crypto STATIC IMPORTED)
176+
set_target_properties(wallet-crypto PROPERTIES IMPORTED_LOCATION
177+
${EXTERNAL_LIBS_DIR}/scala/lib/${ANDROID_ABI}/libwallet-crypto.a)
178+
179+
add_library(cryptonote_format_utils_basic STATIC IMPORTED)
180+
set_target_properties(cryptonote_format_utils_basic PROPERTIES IMPORTED_LOCATION
181+
${EXTERNAL_LIBS_DIR}/scala/lib/${ANDROID_ABI}/libcryptonote_format_utils_basic.a)
182+
170183
#############
171184
# System
172185
#############
@@ -177,12 +190,19 @@ include_directories( ${EXTERNAL_LIBS_DIR}/scala/include )
177190

178191
message(STATUS EXTERNAL_LIBS_DIR : ${EXTERNAL_LIBS_DIR})
179192

193+
if(${ANDROID_ABI} STREQUAL "x86_64")
194+
set(EXTRA_LIBS "wallet-crypto")
195+
else()
196+
set(EXTRA_LIBS "")
197+
endif()
198+
180199
target_link_libraries( monerujo
181200

182201
wallet_api
183202
wallet
184203
cryptonote_core
185204
cryptonote_basic
205+
cryptonote_format_utils_basic
186206
mnemonics
187207
ringct
188208
ringct_basic
@@ -201,8 +221,10 @@ target_link_libraries( monerujo
201221
multisig
202222
version
203223
randomx
224+
felidae
204225
hardforks
205226
rpc_base
227+
${EXTRA_LIBS}
206228

207229
boost_chrono
208230
boost_date_time

‎app/build.gradle‎

Lines changed: 20 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
11
apply plugin: 'com.android.application'
22

33
android {
4-
compileSdkVersion 32
54
defaultConfig {
65
applicationId "io.scalaproject.vault"
6+
buildToolsVersion = '34.0.0'
7+
compileSdk 33
78
minSdkVersion 21
8-
targetSdkVersion 32
9-
versionCode 10
10-
versionName "1.0.9"
9+
targetSdkVersion 33
10+
versionCode 11
11+
versionName "1.1.0"
1112

1213
testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
1314
externalNativeBuild {
@@ -17,7 +18,11 @@ android {
1718
}
1819
}
1920

20-
resConfigs "en", "fr", "de", "el", "eo", "es", "et", "hu", "it", "ja", "nb", "nl", "pt", "pt-rBR", "ro", "ru", "sk", "sr", "sv", "uk", "zh-rCN", "zh-rTW"
21+
ndk {
22+
//noinspection ChromeOsAbiSupport
23+
abiFilters 'arm64-v8a', 'x86_64', 'armeabi-v7a'
24+
}
25+
resourceConfigurations += ['en', 'fr', 'de', 'el', 'eo', 'es', 'et', 'hu', 'it', 'ja', 'nb', 'nl', 'pt', 'pt-rBR', 'ro', 'ru', 'sk', 'sr', 'sv', 'uk', 'zh-rCN', 'zh-rTW']
2126
}
2227

2328
flavorDimensions 'type', 'net'
@@ -82,6 +87,7 @@ android {
8287

8388
// Enumerate translated locales
8489
def availableLocales = ["en"]
90+
namespace 'io.scalaproject.vault'
8591
new File("app/src/main/res/").eachFileMatch(~/^values-.*/) { file ->
8692
def languageTag = file.name.substring(7).replace("-r", "-")
8793
availableLocales.add(languageTag)
@@ -126,20 +132,20 @@ dependencies {
126132
//noinspection GradleDependency
127133
implementation 'com.squareup.okhttp3:okhttp:3.0.1' // keep version 3.0.1 to avoid errors
128134
implementation "com.burgstaller:okhttp-digest:1.18"
129-
implementation "com.jakewharton.timber:timber:$rootProject.ext.timberVersion"
135+
implementation "com.jakewharton.timber:timber:5.0.1"
130136

131-
implementation 'com.nulab-inc:zxcvbn:1.2.3'
137+
implementation 'com.nulab-inc:zxcvbn:1.5.2'
132138

133-
implementation 'dnsjava:dnsjava:2.1.8'
134-
implementation 'org.jitsi:dnssecjava:1.1.3'
135-
implementation 'org.slf4j:slf4j-nop:1.7.25'
139+
implementation 'dnsjava:dnsjava:2.1.9'
140+
implementation 'org.jitsi:dnssecjava:1.2.0'
141+
implementation 'org.slf4j:slf4j-nop:1.7.36'
136142
implementation 'com.github.brnunes:swipeablerecyclerview:1.0.2'
137143

138-
testImplementation "junit:junit:$rootProject.ext.junitVersion"
144+
testImplementation "junit:junit:4.13.2"
139145
testImplementation "org.mockito:mockito-all:$rootProject.ext.mockitoVersion"
140-
testImplementation "com.squareup.okhttp3:mockwebserver:$rootProject.ext.okHttpVersion"
141-
testImplementation 'org.json:json:20180813'
142-
testImplementation 'net.jodah:concurrentunit:0.4.4'
146+
testImplementation "com.squareup.okhttp3:mockwebserver:4.9.3"
147+
testImplementation 'org.json:json:20211205'
148+
testImplementation 'net.jodah:concurrentunit:0.4.6'
143149

144150
def acraVersion = '5.7.0'
145151
implementation "ch.acra:acra-core:$acraVersion"

‎app/src/main/AndroidManifest.xml‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,10 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
3-
xmlns:tools="http://schemas.android.com/tools"
4-
package="io.scalaproject.vault">
3+
xmlns:tools="http://schemas.android.com/tools">
4+
5+
<uses-feature
6+
android:name="android.hardware.camera"
7+
android:required="false" />
58

69
<uses-permission android:name="android.permission.INTERNET" />
710
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />

0 commit comments

Comments
 (0)