Skip to content

Commit

Permalink
[SSDK-1074] adopt SDK with latest commonLib
Browse files Browse the repository at this point in the history
  • Loading branch information
minli5 committed Aug 3, 2017
1 parent 62656c7 commit 5cb2e68
Show file tree
Hide file tree
Showing 5 changed files with 195 additions and 3 deletions.
2 changes: 1 addition & 1 deletion .idea/modules.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

71 changes: 69 additions & 2 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -63,8 +63,7 @@ dependencies {
compile 'com.android.support:design:25.3.1'
compile 'com.android.support:support-vector-drawable:25.3.1'
testCompile 'junit:junit:4.12'
compile project(':common-prod-debug')
compile project(':sdk-dev-debug')

}


Expand All @@ -85,6 +84,9 @@ dependencies {
compile 'com.android.support:support-v4:25.+'
}
dependencies {

//old
/*
compile fileTree(include: ['*.jar'], dir: 'libs')
androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', {
exclude group: 'com.android.support', module: 'support-annotations'
Expand Down Expand Up @@ -162,5 +164,70 @@ dependencies {
testCompile libs.mockito
compile 'joda-time:joda-time:2.9.2'
*/

compile fileTree(dir: 'libs', include: ['*.jar'])

testCompile 'junit:junit:4.12'

compile libs.supportv13
compile libs.supportannotation
compile libs.appcompatv7
compile libs.recyclerviewv7
compile libs.cardviewv7
compile libs.supportdesign
compile libs.gridlayout

compile libs.gson

compile libs.dagger
provided libs.daggercompiler

compile libs.retrofit
compile libs.retrofit_gsonconverter
compile libs.retrofit_rxjava

compile libs.okhttp
compile libs.okhttp_logging

compile libs.eventbus

compile libs.spongycastle_prov
compile libs.spongycastle_core
compile libs.kms

compile libs.ln

compile libs.wmeaar

compile libs.rxjava
compile libs.rxandroid

compile libs.will

compile libs.sqlcipher

/*
compile libs.fasterxml_annotations
compile libs.fasterxml_databind
compile libs.fasterxml_core
*/

debugCompile libs.leak_canary
releaseCompile libs.leak_canary_disabled
testCompile libs.leak_canary_disabled
androidTestCompile libs.leak_canary_disabled

compile libs.rxrelay

testCompile libs.junit
testCompile libs.robolectric
testCompile libs.robolectric_multidex
testCompile libs.mockito
compile 'joda-time:joda-time:2.9.9'
compile 'com.cisco.wx2:diagnostic-events-gson:1.0.86'

compile 'com.segment.analytics.android:analytics:4.3.0-RC1'


}
125 changes: 125 additions & 0 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
// Top-level build file where you can add configuration options common to all sub-projects/modules.

//old
/*
buildscript {
repositories {
jcenter()
Expand All @@ -12,8 +14,31 @@ buildscript {
// in the individual module build.gradle files
}
}
*/

//new commonlib
buildscript {
repositories {
jcenter()
maven {
url 'https://maven.fabric.io/public'
}
}

ext.gradleVersion = System.env.GRADLE_VERSION == null ? '2.2.0' : System.env.GRADLE_VERSION

dependencies {
classpath 'com.github.ben-manes:gradle-versions-plugin:0.12.0'
classpath 'com.jakewharton.sdkmanager:gradle-plugin:0.12.+'
// Hardcode 1.20.0. 1.21.0 crashes the app.
classpath 'io.fabric.tools:gradle:1.20.0'
classpath "com.android.tools.build:gradle:$gradleVersion"
classpath 'com.github.triplet.gradle:play-publisher:1.1.5'
classpath 'me.tatarka:gradle-retrolambda:3.5.0'
}
}

/*
allprojects {
repositories {
jcenter()
Expand All @@ -34,7 +59,34 @@ allprojects {
}
}
}
*/

//new commonlib
allprojects {
repositories {
mavenLocal()
jcenter()
maven {
url 'https://maven.fabric.io/public'
}
maven {
url 'http://engci-maven.cisco.com/artifactory/webex-cca-thirdparty'
}
maven {
url 'http://engci-maven.cisco.com/artifactory/webex-cca-release'
}
maven {
url 'http://engci-maven.cisco.com/artifactory/webex-cca-group'
}
maven {
url 'http://engci-maven.cisco.com/artifactory/androidwb-group/'
}
}
}


//old
/*
ext {
versions = [
wme : System.env.WME_VERSION == null ? '7.0.0' : System.env.WME_VERSION,
Expand Down Expand Up @@ -100,6 +152,79 @@ ext {
]
}
*/

//new
ext {
versions = [
wme : System.env.WME_VERSION == null ? '7.7.0' : System.env.WME_VERSION,
support : '25.3.1',
okhttp: '3.5.0',
retrofit: '2.0.2'
]

libs = [
supportv13 : "com.android.support:support-v13:$versions.support",
supportannotation : "com.android.support:support-annotations:$versions.support",
appcompatv7 : "com.android.support:appcompat-v7:$versions.support",
recyclerviewv7 : "com.android.support:recyclerview-v7:$versions.support",
cardviewv7 : "com.android.support:cardview-v7:$versions.support",
supportdesign : "com.android.support:design:$versions.support",
gridlayout : "com.android.support:gridlayout-v7:$versions.support",
percent : "com.android.support:percent:$versions.support",

gson : 'com.google.code.gson:gson:2.6.2',

dagger : 'com.squareup.dagger:dagger:1.2.2',
daggercompiler : 'com.squareup.dagger:dagger-compiler:1.2.2',

retrofit : "com.squareup.retrofit2:retrofit:$versions.retrofit",
retrofit_gsonconverter : "com.squareup.retrofit2:converter-gson:$versions.retrofit",
retrofit_rxjava: "com.squareup.retrofit2:adapter-rxjava:$versions.retrofit",

okhttp : "com.squareup.okhttp3:okhttp:$versions.okhttp",
okhttp_logging : "com.squareup.okhttp3:logging-interceptor:$versions.okhttp",

eventbus : 'de.greenrobot:eventbus:2.4.0',
ln : 'com.github.benoitdion.ln:ln:0.1.2',

wmeaar: "com.webex:wme4android-release:${versions.wme}@aar",

spongycastle_prov: "com.madgag.spongycastle:prov:1.54.0.0",
spongycastle_core: "com.madgag.spongycastle:core:1.54.0.0",
kms: "com.cisco.wx2:cloud-apps-sdk-kms:1.0.17991",

rxjava :'io.reactivex:rxjava:1.1.1',
rxandroid: "io.reactivex:rxandroid:1.1.0",
rxrelay: "com.jakewharton.rxrelay:rxrelay:1.2.0",

will: "com.wacom.ink.library:willSDK:1.7.0@aar",

leak_canary: "com.squareup.leakcanary:leakcanary-android:1.5",
leak_canary_disabled: "com.squareup.leakcanary:leakcanary-android-no-op:1.5",

sqlcipher: "net.zetetic:android-database-sqlcipher:3.5.4@aar",


// Required for LocusSequenceInfo (and dependent classes) copied from cloud-apps-common

fasterxml_annotations : 'com.fasterxml.jackson.core:jackson-annotations:2.6.3',
fasterxml_databind : 'com.fasterxml.jackson.core:jackson-databind:2.6.3',
fasterxml_core : 'com.fasterxml.jackson.core:jackson-core:2.6.3',


// Test libs
junit: 'junit:junit:4.+',
robolectric: 'org.robolectric:robolectric:3.0',
robolectric_support: 'org.robolectric:shadows-support-v4:3.0',
robolectric_httpclient: 'org.robolectric:shadows-httpclient:3.0',
robolectric_multidex: "org.robolectric:shadows-multidex:3.0",
mockito: 'org.mockito:mockito-core:2.0.7-beta',

joda: 'joda-time:joda-time:2.9.9'
]
}


task clean(type: Delete) {
delete rootProject.buildDir
Expand Down
Binary file modified common-prod-debug/common-prod-debug.aar
Binary file not shown.
Binary file modified sdk-dev-debug/sdk-dev-debug.aar
Binary file not shown.

0 comments on commit 5cb2e68

Please sign in to comment.