Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Prepare repo for v2 #547

Merged
merged 8 commits into from
Apr 3, 2020
Merged

Prepare repo for v2 #547

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
94b8462
Cleaned up most files, left only SplashActivity
Apr 2, 2020
a65ee72
Modified base of the package name
Apr 2, 2020
61b2a42
Renamed last segment of the package name
Apr 2, 2020
7a7f702
Removed some dependencies, mostly rx related stuff
Apr 2, 2020
b074e70
Added data and contracts module and moved abi files accordingly
Apr 2, 2020
08540e7
Removed unnecessary full path to class and added build types for all …
Apr 2, 2020
be186c3
Killed fabric with fire
Apr 2, 2020
9cddcb5
Removed traces of tests
Apr 2, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
54 changes: 3 additions & 51 deletions app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ apply plugin: 'com.android.application'
apply plugin: 'kotlin-android'
apply plugin: 'kotlin-android-extensions'
apply plugin: 'kotlin-kapt'
apply plugin: 'bivrost'
apply plugin: 'io.fabric'
apply from: '../buildsystem/coverageReport.gradle'

Expand All @@ -12,10 +11,10 @@ repositories {

android {
defaultConfig {
applicationId "pm.gnosis.heimdall"
applicationId "io.gnosis.safe"
versionCode getInt("APP_VERSION_CODE", 703)
versionName getKey("APP_VERSION_NAME", "0.4.2-alpha")
testInstrumentationRunner "pm.gnosis.tests.MockTestRunner"
testInstrumentationRunner "io.gnosis.tests.MockTestRunner"

// Debug Settings
buildConfigField javaTypes.BOOLEAN, "VERBOSE_EXCEPTIONS", getKey("VERBOSE_EXCEPTIONS", "false")
Expand Down Expand Up @@ -130,7 +129,6 @@ android {
}

packagingOptions {
exclude 'META-INF/rxjava.properties'
exclude 'META-INF/extensions.kotlin_module'
exclude 'META-INF/LICENSE'
}
Expand Down Expand Up @@ -166,6 +164,7 @@ dependencies {
testImplementation "junit:junit:$versions.junit"

implementation fileTree(include: ['*.jar'], dir: 'libs')
implementation project(":data")

// Gnosis Svalinn
implementation "com.github.gnosis.svalinn-kotlin:accounts-base:$versions.svalinn"
Expand All @@ -187,41 +186,19 @@ dependencies {
implementation "com.github.gnosis.svalinn-kotlin:security:$versions.svalinn"
implementation "com.github.gnosis.svalinn-kotlin:utils:$versions.svalinn"

// Gnosis Bivrost
implementation "com.github.gnosis.bivrost-kotlin:bivrost-solidity-types:$versions.bivrost"

// Fabric
implementation("com.crashlytics.sdk.android:crashlytics:$versions.crashlytics@aar") {
transitive = true
}

// Kethereum RLP
implementation "com.github.walleth.kethereum:rlp:$versions.kethereum"

// Wallet Connect
implementation "com.github.WalletConnect:kotlin-walletconnect-lib:$versions.wallet_connect"

// AndroidX
implementation "androidx.appcompat:appcompat:$versions.androidx_app_compat"
implementation "androidx.cardview:cardview:$versions.androidx_card_view"
implementation "androidx.recyclerview:recyclerview:$versions.androidx_recycler_view"
implementation "androidx.constraintlayout:constraintlayout:$versions.androidx_constraint_layout"
implementation "androidx.lifecycle:lifecycle-common-java8:$versions.androidx_lifecycle"
implementation "androidx.lifecycle:lifecycle-extensions:$versions.androidx_lifecycle"
kapt "androidx.room:room-compiler:$versions.androidx_room"
implementation "androidx.room:room-runtime:$versions.androidx_room"
implementation "androidx.room:room-rxjava2:$versions.androidx_room"
implementation "androidx.multidex:multidex:$versions.multidex"

// Google Material
implementation "com.google.android.material:material:$versions.material"

// Rx
implementation "io.reactivex.rxjava2:rxjava:$versions.rxjava"
implementation "io.reactivex.rxjava2:rxkotlin:$versions.rxkotlin"
implementation "com.gojuno.koptional:koptional:$versions.koptional"
implementation "io.reactivex.rxjava2:rxandroid:$versions.rxandroid"

// Firebase
implementation "com.google.firebase:firebase-analytics:$versions.firebase_analytics"
implementation "com.google.firebase:firebase-messaging:$versions.firebase_messaging"
Expand All @@ -243,46 +220,21 @@ dependencies {
implementation("com.squareup.retrofit2:converter-moshi:$versions.retrofit") {
exclude group: "com.squareup.moshi", module: "moshi"
}
implementation "com.squareup.retrofit2:adapter-rxjava2:$versions.retrofit"

// Logging
implementation "com.jakewharton.timber:timber:$versions.timber"
implementation "com.squareup.okhttp3:logging-interceptor:$versions.okhttp"

// RxBinding
implementation("com.jakewharton.rxbinding2:rxbinding-kotlin:$versions.rxbinding") {
exclude group: "io.reactivex.rxjava2", module: "rxandroid"
}
implementation("com.jakewharton.rxbinding2:rxbinding-support-v4-kotlin:$versions.rxbinding") {
exclude group: "io.reactivex.rxjava2", module: "rxandroid"
}
implementation("com.jakewharton.rxbinding2:rxbinding-recyclerview-v7-kotlin:$versions.rxbinding") {
exclude group: "io.reactivex.rxjava2", module: "rxandroid"
}
implementation("com.jakewharton.rxbinding2:rxbinding-appcompat-v7-kotlin:$versions.rxbinding") {
exclude group: "io.reactivex.rxjava2", module: "rxandroid"
}
implementation("com.jakewharton.rxbinding2:rxbinding-design-kotlin:$versions.rxbinding") {
exclude group: "io.reactivex.rxjava2", module: "rxandroid"
}

implementation "com.squareup.picasso:picasso:$versions.picasso"

// More
implementation "com.github.status-im.status-keycard-java:android:$versions.status_keycard"
implementation "com.google.zxing:core:$versions.zxing"
implementation "com.github.clans:fab:$versions.floating_action_button"
implementation("me.zhanghai.android.materialprogressbar:library:$versions.material_progressbar") {
exclude group: 'com.android.support', module: 'appcompat-v7'
}
implementation("org.bouncycastle:bcprov-jdk15on:$versions.bouncycastle", {
exclude group: 'junit', module: 'junit'
})

// Coroutines
implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:$versions.kotlinx_coroutines"
implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:$versions.kotlinx_coroutines"
implementation "org.jetbrains.kotlinx:kotlinx-coroutines-rx2:$versions.kotlinx_coroutines"
implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:$versions.androidx_lifecycle"
implementation "androidx.lifecycle:lifecycle-livedata-ktx:$versions.androidx_lifecycle"
implementation "androidx.lifecycle:lifecycle-runtime-ktx:$versions.androidx_lifecycle"
Expand Down
Loading