isoron/loop
1
1
Fork 0
mirror of https://github.com/iSoron/uhabits.git synced 2025-12-06 09:08:52 -06:00
Code Issues Packages Projects Releases Wiki Activity

update AGP (3.5.1)

Browse Source 
using default build tools version (from AGP)
This commit is contained in:
olegivo
2019-10-08 11:56:42 +03:00
parent 00abb4486d
commit fe091fa740
7 changed files with 7 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
android/android-base/build.gradle
View File

@@ -2,7 +2,6 @@ apply plugin: 'com.android.library'
android {
compileSdkVersion COMPILE_SDK_VERSION as Integer
buildToolsVersion BUILD_TOOLS_VERSION
defaultConfig {
minSdkVersion MIN_SDK_VERSION as Integer
@@ -30,7 +29,6 @@ android {
abortOnError false
}
buildToolsVersion '26.0.2'
}
dependencies {

2
android/android-pickers/build.gradle
View File

@@ -2,7 +2,6 @@ apply plugin: 'com.android.library'
android {
compileSdkVersion COMPILE_SDK_VERSION as Integer
buildToolsVersion BUILD_TOOLS_VERSION
defaultConfig {
minSdkVersion MIN_SDK_VERSION as Integer
@@ -18,7 +17,6 @@ android {
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
}
}
buildToolsVersion '26.0.2'
compileOptions {
targetCompatibility JavaVersion.VERSION_1_8

4
android/build.gradle
View File

@@ -5,10 +5,8 @@ buildscript {
}
dependencies {
classpath 'com.android.tools.build:gradle:3.0.0'
classpath 'com.neenbedankt.gradle.plugins:android-apt:1.8'
classpath 'com.android.tools.build:gradle:3.5.1'
classpath 'com.getkeepsafe.dexcount:dexcount-gradle-plugin:0.6.4'
classpath 'com.neenbedankt.gradle.plugins:android-apt:1.8'
classpath 'org.jacoco:org.jacoco.core:+'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$KOTLIN_VERSION"
classpath 'org.ajoberstar:grgit:1.5.0'

1
android/gradle.properties
View File

@@ -6,7 +6,6 @@ TARGET_SDK_VERSION = 27
COMPILE_SDK_VERSION = 27
DAGGER_VERSION = 2.9
BUILD_TOOLS_VERSION = 27.0.3
KOTLIN_VERSION = 1.2.41
SUPPORT_LIBRARY_VERSION = 27.1.1
AUTO_FACTORY_VERSION = 1.0-beta6

4
android/gradle/wrapper/gradle-wrapper.properties vendored
View File

@@ -1,6 +1,6 @@
#Sun Sep 24 06:01:27 CDT 2017
#Wed Sep 04 13:05:58 MSK 2019
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip

11
android/uhabits-android/build.gradle
View File

@@ -14,7 +14,6 @@ ext {
android {
compileSdkVersion COMPILE_SDK_VERSION as Integer
buildToolsVersion BUILD_TOOLS_VERSION
if(project.hasProperty("LOOP_STORE_FILE")) {
signingConfigs {
@@ -43,12 +42,6 @@ android {
applicationId "org.isoron.uhabits"
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
javaCompileOptions {
annotationProcessorOptions {
includeCompileClasspath false
}
}
playAccountConfig = playAccountConfigs.defaultAccountConfig
}
@@ -90,7 +83,6 @@ android {
sourceSets {
main.assets.srcDirs += '../uhabits-core/src/main/resources/'
}
buildToolsVersion '26.0.2'
}
dependencies {
@@ -114,7 +106,7 @@ dependencies {
compileOnly "com.google.auto.factory:auto-factory:${AUTO_FACTORY_VERSION}"
kapt "com.google.dagger:dagger-compiler:$DAGGER_VERSION"
kapt "com.jakewharton:butterknife-compiler:9.0.0"
kapt "com.google.auto.factory:auto-factory:${AUTO_FACTORY_VERSION}"
annotationProcessor "com.google.auto.factory:auto-factory:${AUTO_FACTORY_VERSION}"
androidTestImplementation "com.android.support.test.espresso:espresso-contrib:2.2.2"
androidTestImplementation "com.android.support.test.espresso:espresso-core:2.2.2"
@@ -122,6 +114,7 @@ dependencies {
androidTestImplementation "com.google.dagger:dagger:$DAGGER_VERSION"
androidTestImplementation "com.linkedin.testbutler:test-butler-library:1.3.1"
androidTestCompileOnly "com.google.auto.factory:auto-factory:${AUTO_FACTORY_VERSION}"
androidTestAnnotationProcessor "com.google.auto.factory:auto-factory:${AUTO_FACTORY_VERSION}"
androidTestImplementation "com.android.support:support-annotations:$SUPPORT_LIBRARY_VERSION"
androidTestImplementation "com.android.support.test:rules:0.5"
androidTestImplementation "com.android.support.test:runner:0.5"

7
android/uhabits-core/build.gradle
View File

@@ -1,13 +1,10 @@
plugins {
id "net.ltgt.apt" version "0.7"
}
apply plugin: 'idea'
apply plugin: 'java'
apply plugin: 'jacoco'
dependencies {
apt "com.google.auto.factory:auto-factory:${AUTO_FACTORY_VERSION}"
apt 'com.google.dagger:dagger:2.11-rc2'
annotationProcessor "com.google.auto.factory:auto-factory:${AUTO_FACTORY_VERSION}"
annotationProcessor 'com.google.dagger:dagger:2.11-rc2'
compileOnly 'javax.annotation:jsr250-api:1.0'
compileOnly 'org.jetbrains:annotations-java5:15.0'