Skip to content

Commit

Permalink
Update AGP, Gradle, build repositories
Browse files Browse the repository at this point in the history
  • Loading branch information
JakeWharton committed Mar 6, 2019
1 parent 21b95ee commit a811822
Show file tree
Hide file tree
Showing 6 changed files with 14 additions and 8 deletions.
14 changes: 10 additions & 4 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,23 +1,29 @@
buildscript {
repositories {
jcenter()
mavenCentral()
google()
}
dependencies {
classpath 'com.android.tools.build:gradle:3.1.1'
classpath 'com.android.tools.build:gradle:3.3.2'
}
}

allprojects {
repositories {
jcenter()
mavenCentral()
google()
jcenter {
// Required for a dependency of Android lint.
content {
includeGroup 'org.jetbrains.trove4j'
}
}
}
}

ext {
minSdkVersion = 15
compileSdkVersion = 27
compileSdkVersion = 28

junit = 'junit:junit:4.12'
truth = 'com.google.truth:truth:0.40'
Expand Down
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-4.7-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-5.2.1-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
2 changes: 1 addition & 1 deletion gradlew
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ APP_NAME="Gradle"
APP_BASE_NAME=`basename "$0"`

# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
DEFAULT_JVM_OPTS=""
DEFAULT_JVM_OPTS='"-Xmx64m"'

# Use the maximum available, or set MAX_FD != -1 to use that value.
MAX_FD="maximum"
Expand Down
2 changes: 1 addition & 1 deletion sample/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ android {
defaultConfig {
applicationId 'com.jakewharton.threetenabp.sample'
minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion 27
targetSdkVersion 28
versionCode 1
versionName '1.0'

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,6 @@ public static void init(Context context) {
}

private AndroidThreeTen() {
throw new AssertionError("No instances.");
throw new AssertionError();
}
}

0 comments on commit a811822

Please sign in to comment.