Updated to latest build tools

Replaced scala plugin with fork at
https://github.com/xelnaga/gradle-android-scala-plugin

This fixes #56
This commit is contained in:
Felix Ableitner 2016-09-30 17:22:11 +09:00
parent 8334cd3926
commit f50d0697e6
6 changed files with 11 additions and 59 deletions

3
.gitmodules vendored Normal file
View file

@ -0,0 +1,3 @@
[submodule "buildSrc"]
path = buildSrc
url = https://github.com/xelnaga/gradle-android-scala-plugin.git

View file

@ -1,17 +1,8 @@
apply plugin: 'com.android.application' apply plugin: 'com.android.application'
apply plugin: 'jp.leafytree.android-scala' apply plugin: 'jp.leafytree.android-scala'
buildscript {
repositories {
jcenter()
}
dependencies {
classpath "jp.leafytree.gradle:gradle-android-scala-plugin:1.4"
}
}
dependencies { dependencies {
compile 'com.android.support:design:24.2.0' compile 'com.android.support:design:24.2.1'
compile 'com.android.support:multidex:1.0.1' compile 'com.android.support:multidex:1.0.1'
compile 'org.scala-lang:scala-library:2.11.7' compile 'org.scala-lang:scala-library:2.11.7'
compile 'com.mobsandgeeks:adapter-kit:0.5.3' compile 'com.mobsandgeeks:adapter-kit:0.5.3'
@ -34,12 +25,12 @@ preBuild.doFirst {
} }
android { android {
compileSdkVersion 23 compileSdkVersion 24
buildToolsVersion "22.0.1" buildToolsVersion "24.0.2"
defaultConfig { defaultConfig {
applicationId "com.nutomic.ensichat" applicationId "com.nutomic.ensichat"
targetSdkVersion 23 targetSdkVersion 24
versionCode 17 versionCode 17
versionName "0.5.2" versionName "0.5.2"
multiDexEnabled true multiDexEnabled true
@ -51,13 +42,6 @@ android {
applicationIdSuffix ".debug" applicationIdSuffix ".debug"
testCoverageEnabled true testCoverageEnabled true
} }
release {
// HACK: This shouldn't be needed, but multidex isn't working correctly.
// https://code.google.com/p/android/issues/detail?id=206131
// https://code.google.com/p/android/issues/detail?id=209084
minifyEnabled true
proguardFiles getDefaultProguardFile('proguard-android.txt'), file('proguard-rules.txt')
}
} }
// Increasing minSdkVersion reduces compilation time for MultiDex. // Increasing minSdkVersion reduces compilation time for MultiDex.

View file

@ -1,36 +0,0 @@
# Add project specific ProGuard rules here.
# By default, the flags in this file are appended to flags specified
# in /home/sg/adt/sdk/tools/proguard/proguard-android.txt
# You can edit the include path and order by changing the ProGuard
# include property in project.properties.
#
# For more details, see
# http://developer.android.com/guide/developing/tools/proguard.html
# Add any project specific keep options here:
# If your project uses WebView with JS, uncomment the following
# and specify the fully qualified class name to the JavaScript interface
# class:
#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
# public *;
#}
-dontobfuscate
-keep class scala.** { *; }
-keep class slick.** { *; }
-keep class org.joda.time.** { *; }
-keep class org.h2.** { *; }
-keep class java.util.** { *; }
-keepclassmembers class java.util.Comparator {
public *;
}
-dontwarn scala.**
-dontwarn slick.**
-dontwarn org.joda.time.**
-dontwarn org.h2.**
-dontwarn java.util.function.**
-ignorewarnings

View file

@ -5,7 +5,7 @@ buildscript {
jcenter() jcenter()
} }
dependencies { dependencies {
classpath 'com.android.tools.build:gradle:1.3.1' classpath 'com.android.tools.build:gradle:2.2.0'
classpath 'com.github.ben-manes:gradle-versions-plugin:0.13.0' classpath 'com.github.ben-manes:gradle-versions-plugin:0.13.0'
} }
} }

1
buildSrc Submodule

@ -0,0 +1 @@
Subproject commit fc9d3267aa2edf6442fea79084cce03ecd2bde34

View file

@ -3,5 +3,5 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-2.9-all.zip distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip
distributionSha256Sum=4647967f8de78d6d6d8093cdac50f368f8c2b8038f41a5afe1c3bce4c69219a9 distributionSha256Sum=88a910cdf2e03ebbb5fe90f7ecf534fc9ac22e12112dc9a2fee810c598a76091