narayana/conversations-classic
3
2
Fork 0
Code Issues 3 Pull requests 2 Actions Packages Projects Releases 4 Wiki Activity

upgrade to gradle plugin 3

Browse source
This commit is contained in:
Daniel Gultsch 2017-12-09 16:19:56 +01:00
parent 60ae269870
commit 811abedf67
4 changed files with 41 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
.gitignore vendored
View file

@ -8,7 +8,6 @@ src/playstore/res/values/gcm.xml
.gradle/ .gradle/
build/ build/
captures/ captures/
gradle.properties
signing.properties signing.properties
# Ignore Gradle GUI config # Ignore Gradle GUI config
gradle-app.setting gradle-app.setting

66
build.gradle
View file

@ -2,10 +2,11 @@
// sub-projects/modules. // sub-projects/modules.
buildscript { buildscript {
repositories { repositories {
google()
jcenter() jcenter()
} }
dependencies { dependencies {
classpath 'com.android.tools.build:gradle:2.3.3' classpath 'com.android.tools.build:gradle:3.0.1'
} }
} }
@ -23,8 +24,8 @@ repositories {
} }
configurations { configurations {
playstoreCompile playstoreImplementation
freeCompile freeImplementation
} }
ext { ext {
@ -32,29 +33,28 @@ ext {
} }
dependencies { dependencies {
compile project(':libs:MemorizingTrustManager') implementation project(':libs:MemorizingTrustManager')
playstoreCompile 'com.google.android.gms:play-services-gcm:11.6.2' playstoreImplementation 'com.google.android.gms:play-services-gcm:11.6.2'
compile 'org.sufficientlysecure:openpgp-api:10.0' implementation 'org.sufficientlysecure:openpgp-api:10.0'
compile 'com.soundcloud.android:android-crop:1.0.1@aar' implementation 'com.soundcloud.android:android-crop:1.0.1@aar'
compile "com.android.support:support-v13:$supportLibVersion" implementation "com.android.support:support-v13:$supportLibVersion"
compile "com.android.support:appcompat-v7:$supportLibVersion" implementation "com.android.support:appcompat-v7:$supportLibVersion"
compile "com.android.support:support-emoji:$supportLibVersion" implementation "com.android.support:support-emoji:$supportLibVersion"
freeCompile "com.android.support:support-emoji-bundled:$supportLibVersion" freeImplementation "com.android.support:support-emoji-bundled:$supportLibVersion"
compile 'org.jitsi:org.otr4j:0.22' implementation 'org.bouncycastle:bcmail-jdk15on:1.56'
compile 'org.bouncycastle:bcmail-jdk15on:1.56' implementation 'org.jitsi:org.otr4j:0.22'
compile 'org.gnu.inet:libidn:1.15' implementation 'org.gnu.inet:libidn:1.15'
compile 'com.google.zxing:core:3.2.1' implementation 'com.google.zxing:core:3.2.1'
compile 'com.google.zxing:android-integration:3.2.1' implementation 'com.google.zxing:android-integration:3.2.1'
compile 'de.measite.minidns:minidns-hla:0.2.4' implementation 'de.measite.minidns:minidns-hla:0.2.4'
compile 'de.timroes.android:EnhancedListView:0.3.4' implementation 'de.timroes.android:EnhancedListView:0.3.4'
compile 'me.leolin:ShortcutBadger:1.1.19@aar' implementation 'me.leolin:ShortcutBadger:1.1.19@aar'
compile 'com.kyleduo.switchbutton:library:1.2.8' implementation 'com.kyleduo.switchbutton:library:1.2.8'
compile 'org.whispersystems:signal-protocol-java:2.6.2' implementation 'org.whispersystems:signal-protocol-java:2.6.2'
compile 'com.makeramen:roundedimageview:2.3.0' implementation 'com.makeramen:roundedimageview:2.3.0'
compile "com.wefika:flowlayout:0.4.1" implementation "com.wefika:flowlayout:0.4.1"
compile 'net.ypresto.androidtranscoder:android-transcoder:0.2.0' implementation 'net.ypresto.androidtranscoder:android-transcoder:0.2.0'
compile 'com.github.scottyab:showhidepasswordedittext:0.8' implementation 'com.github.scottyab:showhidepasswordedittext:0.8'
} }
ext { ext {
@ -82,13 +82,19 @@ android {
} }
compileOptions { compileOptions {
sourceCompatibility JavaVersion.VERSION_1_7 sourceCompatibility JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_1_7 targetCompatibility JavaVersion.VERSION_1_8
} }
flavorDimensions("distribution")
productFlavors { productFlavors {
playstore playstore {
free dimension "distribution"
}
free {
dimension "distribution"
}
} }
buildTypes { buildTypes {

2
gradle.properties Normal file
View file

@ -0,0 +1,2 @@
org.gradle.jvmargs=-Xmx2048M
android.enableAapt2=false

6
libs/MemorizingTrustManager/build.gradle
View file

@ -1,10 +1,10 @@
buildscript { buildscript {
repositories { repositories {
mavenCentral() google()
jcenter()
} }
dependencies { dependencies {
classpath 'com.android.tools.build:gradle:2.3.0' classpath 'com.android.tools.build:gradle:3.0.1'
} }
} }