Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
102 changes: 53 additions & 49 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ android {
}

configurations {
compile.exclude group: 'org.jetbrains', module: 'annotations'
implementation.exclude group: 'org.jetbrains', module: 'annotations'
all*.exclude group: 'com.android.volley'
}

Expand Down Expand Up @@ -114,98 +114,102 @@ spotless {
}

dependencies {
compile fileTree(include: ['*.jar'], dir: 'libs')
androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', {
implementation fileTree(include: ['*.jar'], dir: 'libs')
androidTestImplementation('com.android.support.test.espresso:espresso-core:2.2.2', {
exclude group: 'com.android.support', module: 'support-annotations'
})

implementation 'com.mcxiaoke.volley:library:1.0.19'

//google and support
compile "com.android.support:appcompat-v7:$rootProject.supportLibraryVersion"
compile "com.android.support:design:$rootProject.supportLibraryVersion"
compile "com.android.support:support-vector-drawable:$rootProject.supportLibraryVersion"
compile "com.android.support:palette-v7:$rootProject.supportLibraryVersion"
compile "com.android.support:cardview-v7:$rootProject.supportLibraryVersion"
compile "com.android.support:customtabs:$rootProject.supportLibraryVersion"
compile 'com.android.support.constraint:constraint-layout:1.0.2'
implementation "com.android.support:appcompat-v7:$rootProject.supportLibraryVersion"
implementation "com.android.support:animated-vector-drawable:28.0.0"
implementation "com.android.support:support-v4:28.0.0"
implementation "com.android.support:design:$rootProject.supportLibraryVersion"
implementation "com.android.support:support-vector-drawable:$rootProject.supportLibraryVersion"
implementation "com.android.support:palette-v7:$rootProject.supportLibraryVersion"
implementation "com.android.support:cardview-v7:$rootProject.supportLibraryVersion"
implementation "com.android.support:customtabs:$rootProject.supportLibraryVersion"
implementation 'com.android.support.constraint:constraint-layout:1.1.3'

//exoplayer
compile 'com.google.android.exoplayer:exoplayer:r1.5.7'
implementation 'com.google.android.exoplayer:exoplayer:r1.5.7'

//utils
compile 'com.github.deano2390:MaterialShowcaseView:1.2.0@aar'
compile "com.jakewharton:butterknife:$rootProject.butterknifeVersion"
implementation 'com.github.deano2390:MaterialShowcaseView:1.2.0@aar'
implementation "com.jakewharton:butterknife:$rootProject.butterknifeVersion"
annotationProcessor "com.jakewharton:butterknife-compiler:$rootProject.butterknifeVersion"
compile 'com.github.bumptech.glide:glide:3.7.0'
compile 'com.yalantis:ucrop:1.5.0'
compile 'de.psdev.licensesdialog:licensesdialog:1.8.0'
/*compile('com.crashlytics.sdk.android:crashlytics:2.9.3@aar') {
implementation 'com.github.bumptech.glide:glide:3.7.0'
implementation 'com.yalantis:ucrop:1.5.0'
implementation 'de.psdev.licensesdialog:licensesdialog:1.8.0'
/*implementation('com.crashlytics.sdk.android:crashlytics:2.9.3@aar') {
transitive = true;
}*/

compile 'com.koushikdutta.ion:ion:2.1.7'
compile 'org.jetbrains:annotations-java5:15.0'
compile 'com.android.support:multidex:1.0.1'
compile group: 'com.box', name: 'box-android-sdk', version: '4.0.8'
implementation 'com.koushikdutta.ion:ion:2.1.7'
implementation 'org.jetbrains:annotations-java5:15.0'
implementation 'com.android.support:multidex:1.0.3'
implementation group: 'com.box', name: 'box-android-sdk', version: '4.0.8'

//icons
compile 'com.mikepenz:iconics-core:2.8.4@aar'
compile 'com.mikepenz:google-material-typeface:2.2.0.3.original@aar'
compile 'com.mikepenz:community-material-typeface:1.5.54.2@aar'
compile 'com.mikepenz:fontawesome-typeface:4.6.0.1@aar'
compile 'com.mikepenz:ionicons-typeface:+@aar'
implementation 'com.mikepenz:iconics-core:2.8.4@aar'
implementation 'com.mikepenz:google-material-typeface:2.2.0.3.original@aar'
implementation 'com.mikepenz:community-material-typeface:1.5.54.2@aar'
implementation 'com.mikepenz:fontawesome-typeface:4.6.0.1@aar'
implementation 'com.mikepenz:ionicons-typeface:+@aar'

//ui
compile 'de.hdodenhof:circleimageview:2.0.0'
compile 'uz.shift:colorpicker:0.5@aar'
compile 'com.turingtechnologies.materialscrollbar:lib:10.0.3'
compile 'pl.droidsonroids.gif:android-gif-drawable:1.2.7'
compile 'com.github.shchurov:horizontalwheelview:0.9.5'
compile 'com.nostra13.universalimageloader:universal-image-loader:1.9.4'
implementation 'de.hdodenhof:circleimageview:2.0.0'
implementation 'uz.shift:colorpicker:0.5@aar'
implementation 'com.turingtechnologies.materialscrollbar:lib:10.0.3'
implementation 'pl.droidsonroids.gif:android-gif-drawable:1.2.7'
implementation 'com.github.shchurov:horizontalwheelview:0.9.5'
implementation 'com.nostra13.universalimageloader:universal-image-loader:1.9.4'

//twitter
compile "com.twitter.sdk.android:twitter:$rootProject.twitterVersion"
compile files('libs/twitter4j-core-3.0.5.jar')
compile files('libs/twitter4j-media-support-3.0.5.jar')
implementation "com.twitter.sdk.android:twitter:$rootProject.twitterVersion"
implementation files('libs/twitter4j-core-3.0.5.jar')
implementation files('libs/twitter4j-media-support-3.0.5.jar')

//cloud rail
compile 'com.cloudrail:cloudrail-si-android:2.20.1'
implementation 'com.cloudrail:cloudrail-si-android:2.20.1'

//next cloud
compile "com.github.nextcloud:android-library:$rootProject.nextCloudVersion"
implementation "com.github.nextcloud:android-library:$rootProject.nextCloudVersion"

//leak canary
debugCompile 'com.squareup.leakcanary:leakcanary-android-no-op:1.5.1'
releaseCompile 'com.squareup.leakcanary:leakcanary-android-no-op:1.5.1'
debugImplementation 'com.squareup.leakcanary:leakcanary-android-no-op:1.5.1'
releaseImplementation 'com.squareup.leakcanary:leakcanary-android-no-op:1.5.1'

//flickr
compile files('libs/flickrj-android-2.1.0.jar')
implementation files('libs/flickrj-android-2.1.0.jar')

//tumblr
compile('com.tumblr:jumblr:0.0.11') {
implementation('com.tumblr:jumblr:0.0.11') {
exclude module: 'scribe'
}

//realm
compile 'com.uphyca:stetho_realm:2.0.0'
implementation 'com.uphyca:stetho_realm:2.0.0'

//metadataextractor
compile 'com.drewnoakes:metadata-extractor:2.9.1'
implementation 'com.drewnoakes:metadata-extractor:2.9.1'

//tests
testCompile "junit:junit:$rootProject.junitVersion"
androidTestCompile 'com.google.code.findbugs:jsr305:3.0.0'
testImplementation "junit:junit:$rootProject.junitVersion"
androidTestImplementation 'com.google.code.findbugs:jsr305:3.0.0'

//opencv
compile project(':openCV')
implementation project(':openCV')

//pdk
compile project(':pdk')
implementation project(':pdk')

//photoview
compile project(':photoview')
implementation project(':photoview')

//compressor
compile 'id.zelory:compressor:2.1.0'
implementation 'id.zelory:compressor:2.1.0'

}

Expand Down
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ allprojects {
}

ext {
supportLibraryVersion = '26.1.0'
supportLibraryVersion = '28.0.0'
butterknifeVersion = '8.6.0'
junitVersion = "4.12"
twitterVersion = "3.0.0"
Expand Down
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -23,5 +23,5 @@ org.gradle.jvmargs=-XX:MaxPermSize=1024m -XX:+CMSClassUnloadingEnabled -XX:+Heap
org.gradle.parallel=true
# When set to true the Gradle daemon is used to run the build. For local developer builds this is our favorite property.
# The developer environment is optimized for speed and feedback so we nearly always run Gradle jobs with the daemon.
android.enableBuildCache=false
android.enableBuildCache=true
org.gradle.daemon=true
3 changes: 0 additions & 3 deletions openCV/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,3 @@ android {
}
}
}

dependencies {
}
6 changes: 3 additions & 3 deletions pdk/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ android {
}

dependencies {
compile fileTree(dir: 'libs', include: ['*.jar'])
compile 'com.android.support:appcompat-v7:26.1.0'
compile 'com.mcxiaoke.volley:library:1.0.19'
implementation fileTree(dir: 'libs', include: ['*.jar'])
implementation 'com.android.support:appcompat-v7:26.1.0'
implementation 'com.mcxiaoke.volley:library:1.0.19'
}
12 changes: 6 additions & 6 deletions photoview/build.gradle
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
apply plugin: 'com.android.library'

android {
compileSdkVersion 26
buildToolsVersion "26.0.3"
compileSdkVersion 28
buildToolsVersion "28.0.3"

defaultConfig {
minSdkVersion 15
targetSdkVersion 26
minSdkVersion 21
targetSdkVersion 28
versionCode 1
versionName "1.0"

Expand All @@ -25,6 +25,6 @@ android {
}

dependencies {
compile fileTree(dir: 'libs', include: ['*.jar'])
compile 'com.android.support:appcompat-v7:26.1.0'
implementation fileTree(dir: 'libs', include: ['*.jar'])
implementation 'com.android.support:appcompat-v7:28.0.0'
}