Update build files & gitignore for AndroidStudio 3.4

pull/785/head
James Brown 5 years ago
parent 08b6794160
commit 25f1e96ca6
  1. 4
      .gitignore
  2. 7
      app/build.gradle
  3. 2
      build.gradle
  4. 4
      gradle/wrapper/gradle-wrapper.properties

4
.gitignore vendored

@ -11,6 +11,10 @@
*.swp *.swp
*.swo *.swo
app/mapping.txt
app/seeds.txt
app/unused.txt
# Files for the Dalvik VM # Files for the Dalvik VM
*.dex *.dex

@ -60,13 +60,6 @@ android {
packagingOptions { packagingOptions {
exclude 'META-INF/NOTICE' // will not include NOTICE file exclude 'META-INF/NOTICE' // will not include NOTICE file
exclude 'META-INF/LICENSE' // will not include LICENSE file exclude 'META-INF/LICENSE' // will not include LICENSE file
// as noted by @Vishnuvathsan you may also need to include
// variations on the file name. It depends on your dependencies.
// Some other common variations on notice and license file names
//exclude 'META-INF/notice'
//exclude 'META-INF/notice.txt'
//exclude 'META-INF/license'
//exclude 'META-INF/license.txt'
} }
lintOptions { lintOptions {
abortOnError false abortOnError false

@ -13,7 +13,7 @@ buildscript {
// don't do that. add that repository to app/build.gradle // don't do that. add that repository to app/build.gradle
} }
dependencies { dependencies {
classpath 'com.android.tools.build:gradle:3.4.2' classpath 'com.android.tools.build:gradle:3.5.0'
classpath "io.realm:realm-gradle-plugin:5.13.0" classpath "io.realm:realm-gradle-plugin:5.13.0"
// WARNING WARNING WARNING // WARNING WARNING WARNING
// you are about to add here a dependency to be used in the Android app // you are about to add here a dependency to be used in the Android app

@ -1,6 +1,6 @@
#Thu Aug 01 15:27:15 AEST 2019 #Thu Aug 22 13:43:08 AEST 2019
distributionBase=GRADLE_USER_HOME 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-5.1.1-all.zip distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip

Loading…
Cancel
Save