Skip to content

Commit ff89684

Browse files
authored
Merge pull request #79 from soramitsu/develop
Beta release
2 parents 15d4065 + e4dbf8a commit ff89684

File tree

652 files changed

+28528
-1386
lines changed

Some content is hidden

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

652 files changed

+28528
-1386
lines changed

.gitignore

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,7 @@
77
.externalNativeBuild
88
app/src/main/aidl/
99
app/*.apk
10-
/.idea/
10+
/.idea/
11+
12+
# ignore jacoco coverage reports
13+
/coverage

Jenkinsfile

Lines changed: 3 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -1,44 +1,4 @@
1-
def dockerImage = 'build-tools/android-build-box:latest'
1+
@Library('jenkins-library' ) _
22

3-
node('d3-build-agent') {
4-
properties(
5-
[
6-
disableConcurrentBuilds()
7-
]
8-
)
9-
timestamps {
10-
try {
11-
stage('Git pull'){
12-
def scmVars = checkout scm
13-
env.GIT_BRANCH = scmVars.GIT_LOCAL_BRANCH
14-
env.GIT_COMMIT = scmVars.GIT_COMMIT
15-
}
16-
withCredentials([
17-
[$class: 'FileBinding', credentialsId: 'firebase_sora_app_distribution_key', variable: 'GOOGLE_APPLICATION_CREDENTIALS'],
18-
[$class: 'FileBinding', credentialsId: 'android_keystore_debug', variable: 'CI_KEYSTORE_PATH'],
19-
[$class: 'StringBinding', credentialsId: 'android_keystore_storepass_debug', variable: 'CI_KEYSTORE_PASS'],
20-
[$class: 'StringBinding', credentialsId: 'android_keyalias_debug', variable: 'CI_KEYSTORE_KEY_ALIAS'],
21-
[$class: 'StringBinding', credentialsId: 'android_keypass_debug', variable: 'CI_KEYSTORE_KEY_PASS']])
22-
{
23-
docker.withRegistry('https://docker.soramitsu.co.jp', 'nexus-build-tools-ro') {
24-
docker.image("${dockerImage}").inside() {
25-
stage('Check code style') {
26-
sh "./gradlew ktlint"
27-
}
28-
stage('Run tests') {
29-
sh "./gradlew clean runModuleTests"
30-
}
31-
stage('Build and deploy') {
32-
sh "./gradlew clean assembleDebug"
33-
}
34-
}
35-
}
36-
}
37-
} catch (e) {
38-
currentBuild.result = 'FAILURE'
39-
} finally {
40-
archiveArtifacts allowEmptyArchive: true, artifacts: 'build/reports/checkstyle/*.html, build-logs/*.gz'
41-
cleanWs()
42-
}
43-
}
44-
}
3+
def pipeline = new org.android.AppPipeline(steps: this, sonar: false, testCmd: 'runTest')
4+
pipeline.runPipeline('fearless')

README.md

Lines changed: 17 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,17 @@
1-
# fearless-Android
2-
fearless-Android (This repository is managed by Terraform!)
1+
### Fearless Wallet Android
2+
3+
![logo](/docs/fearlesswallet_promo.png)
4+
5+
[![](https://img.shields.io/twitter/follow/FearlessWallet?label=Follow&style=social)](https://twitter.com/FearlessWallet)
6+
7+
## About
8+
Fearless Wallet is a mobile wallet designed for the decentralized future on the Kusama network, with support on iOS and Android platforms. The best user experience, fast performance, and secure storage for your accounts. Development of Fearless Wallet is supported by Kusama Treasury grant.
9+
10+
## Roadmap
11+
Fearless Wallet roadmap is available for everyone: [roadmap link](https://soramitsucoltd.aha.io/shared/97bc3006ee3c1baa0598863615cf8d14)
12+
13+
## Dev Status
14+
Track features development: [board link](https://soramitsucoltd.aha.io/shared/343e5db57d53398e3f26d0048158c4a2)
15+
16+
## License
17+
Fearless Wallet Android is available under the Apache 2.0 license. See the LICENSE file for more info.

app/build.gradle

Lines changed: 67 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,48 +1,101 @@
11
apply plugin: 'com.android.application'
2+
apply plugin: 'com.google.gms.google-services'
23
apply plugin: 'kotlin-android'
34
apply plugin: 'kotlin-android-extensions'
45
apply plugin: 'kotlin-kapt'
6+
apply plugin: 'com.google.firebase.appdistribution'
7+
apply plugin: "com.github.triplet.play"
8+
apply from: "../scripts/versions.gradle"
59

610
android {
711
compileSdkVersion rootProject.compileSdkVersion
812
defaultConfig {
913
applicationId "jp.co.soramitsu.fearless"
1014
minSdkVersion rootProject.minSdkVersion
1115
targetSdkVersion rootProject.targetSdkVersion
12-
versionCode rootProject.versionCode
13-
versionName rootProject.versionName
16+
versionCode computeVersionCode()
17+
versionName computeVersionName()
1418
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
1519
}
20+
signingConfigs {
21+
ci {
22+
storeFile file(System.env.CI_KEYSTORE_PATH ?: "stub")
23+
storePassword System.env.CI_KEYSTORE_PASS ?: ""
24+
keyAlias System.env.CI_KEYSTORE_KEY_ALIAS ?: ""
25+
keyPassword System.env.CI_KEYSTORE_KEY_PASS ?: ""
26+
}
27+
}
1628
buildTypes {
1729
debug {
30+
applicationIdSuffix '.debug'
1831
versionNameSuffix '-debug'
1932
}
2033
release {
2134
minifyEnabled false
2235
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
36+
signingConfig signingConfigs.ci
37+
}
38+
develop {
39+
signingConfig signingConfigs.ci
40+
matchingFallbacks = ['debug']
41+
versionNameSuffix '-develop'
42+
applicationIdSuffix '.dev'
43+
//Init firebase
44+
def localReleaseNotes = releaseNotes()
45+
def localFirebaseGroup = firebaseGroup()
46+
firebaseAppDistribution {
47+
releaseNotes = localReleaseNotes
48+
groups = localFirebaseGroup
49+
}
50+
}
51+
}
52+
53+
android {
54+
compileOptions {
55+
sourceCompatibility 1.8
56+
targetCompatibility 1.8
2357
}
2458
}
2559
}
2660

61+
play {
62+
serviceAccountCredentials = file(System.env.CI_PLAY_KEY ?: "../key/fake.json")
63+
track = "beta"
64+
releaseStatus = "completed"
65+
}
66+
2767
dependencies {
2868
implementation fileTree(dir: 'libs', include: ['*.jar'])
29-
implementation project(':core')
3069
implementation project(':core-db')
3170
implementation project(':common')
3271
implementation project(':feature-splash')
33-
implementation project(':feature-user-api')
34-
implementation project(':feature-user-impl')
72+
73+
implementation project(':feature-onboarding-api')
74+
implementation project(':feature-onboarding-impl')
75+
76+
implementation project(':feature-account-api')
77+
implementation project(':feature-account-impl')
78+
79+
implementation project(':feature-wallet-api')
80+
implementation project(':feature-wallet-impl')
3581

3682
implementation kotlinDep
3783

3884
implementation androidDep
3985
implementation constraintDep
4086

87+
implementation zXingEmbeddedDep
88+
4189
implementation navigationFragmentDep
4290
implementation navigationUiDep
4391

92+
implementation rxJavaDep
93+
implementation rxAndroidDep
94+
4495
implementation roomDep
4596

97+
implementation fearlessLibDep
98+
4699
implementation daggerDep
47100
kapt daggerKapt
48101

@@ -52,4 +105,12 @@ dependencies {
52105
implementation retrofitDep
53106
implementation gsonConvertedDep
54107
implementation rxCallAdapterDep
55-
}
108+
109+
implementation gifDep
110+
}
111+
112+
task printVersion {
113+
doLast {
114+
println "versionName:${computeVersionName()}"
115+
}
116+
}

0 commit comments

Comments
 (0)