Skip to content

Commit 7bd016b

Browse files
authored
Merge pull request #22 from hannesa2/Android-Studio-3.5.2
Android Studio 3.5.2
2 parents f0946d8 + c228c0f commit 7bd016b

File tree

6 files changed

+9
-17
lines changed

6 files changed

+9
-17
lines changed

android-studio-3/build.gradle

+2-8
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,14 @@
1-
// Top-level build file where you can add configuration options common to all sub-projects/modules.
2-
31
buildscript {
42
ext {
5-
gradlePluginVersion = '3.2.0-rc02'
6-
lintVersion = '26.2.0-rc02'
3+
lintVersion = '26.5.0'
74
}
85

96
repositories {
107
google()
118
jcenter()
129
}
1310
dependencies {
14-
classpath "com.android.tools.build:gradle:$gradlePluginVersion"
15-
16-
// NOTE: Do not place your application dependencies here; they belong
17-
// in the individual module build.gradle files
11+
classpath "com.android.tools.build:gradle:3.5.2"
1812
}
1913
}
2014

android-studio-3/checks/.gitignore

-1
This file was deleted.

android-studio-3/checks/build.gradle

+4-4
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@ dependencies {
44
// For a description of the below dependencies, see the main project README
55
compileOnly "com.android.tools.lint:lint-api:$lintVersion"
66
compileOnly "com.android.tools.lint:lint-checks:$lintVersion"
7-
testCompile "junit:junit:4.12"
8-
testCompile "com.android.tools.lint:lint:$lintVersion"
9-
testCompile "com.android.tools.lint:lint-tests:$lintVersion"
10-
testCompile "com.android.tools:testutils:$lintVersion"
7+
testImplementation "junit:junit:4.12"
8+
testImplementation "com.android.tools.lint:lint:$lintVersion"
9+
testImplementation "com.android.tools.lint:lint-tests:$lintVersion"
10+
testImplementation "com.android.tools:testutils:$lintVersion"
1111
}
1212

1313
sourceCompatibility = "1.8"

android-studio-3/gradle/wrapper/gradle-wrapper.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-6.0-all.zip

android-studio-3/library/.gitignore

-1
This file was deleted.

android-studio-3/library/build.gradle

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
apply plugin: 'com.android.library'
22

33
android {
4-
compileSdkVersion 26
4+
compileSdkVersion 29
55
defaultConfig {
66
minSdkVersion 15
7-
targetSdkVersion 26
7+
targetSdkVersion 29
88
}
99
compileOptions {
1010
sourceCompatibility JavaVersion.VERSION_1_8

0 commit comments

Comments
 (0)