Skip to content

Commit

Permalink
Prepare for release 1.3.0.
Browse files Browse the repository at this point in the history
  • Loading branch information
Iurii Makhno committed Oct 15, 2020
1 parent 24df0e8 commit a380c5b
Show file tree
Hide file tree
Showing 115 changed files with 6,083 additions and 1,696 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -26,4 +26,4 @@ https://developer.android.com/studio/command-line/bundletool

## Releases

Latest release: [1.2.0](https://github.com/google/bundletool/releases)
Latest release: [1.3.0](https://github.com/google/bundletool/releases)
23 changes: 7 additions & 16 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -21,17 +21,6 @@ apply plugin: "maven"
repositories {
jcenter()
google()
// We need to add this custom format repo because we use r8 version which is
// not available in gMaven yet. This repo can be removed once new version is
// uploaded to gMaven.
// Shrunk version of r8 is available there by the following path:
// https://storage.googleapis.com/r8-releases/raw/[revision]/r8lib.jar
ivy {
url "https://storage.googleapis.com/r8-releases/raw"
patternLayout {
artifact "[revision]/[artifact]lib.[ext]"
}
}
}

configurations {
Expand All @@ -42,10 +31,11 @@ configurations {

// The repackaging rules are defined in the "shadowJar" task below.
dependencies {
compile "com.android.tools:r8:2.0.23"
compile "com.android.tools.build:apkzlib:4.0.0"
compile "com.android.tools.build:apksig:4.0.0"
compile "com.android.tools:r8:2.1.66"
compile "com.android.tools.build:apkzlib:4.2.0-alpha13"
compile "com.android.tools.build:apksig:4.2.0-alpha13"
compile "com.android.tools.ddms:ddmlib:26.2.0"
compile "com.android:zipflinger:4.2.0-alpha11"

shadow "com.android.tools.build:aapt2-proto:4.1.0-alpha01-6193524"
shadow "com.google.auto.value:auto-value-annotations:1.6.2"
Expand Down Expand Up @@ -151,6 +141,7 @@ shadowJar {
// Package all the Android Gradle plugin dependencies that are compiled from
// source.
dependencies {
include(dependency('com.android:zipflinger:.*'))
include(dependency {
it.moduleGroup.startsWith('com.android.tools')
})
Expand Down Expand Up @@ -180,8 +171,8 @@ task executableJar(type: ShadowJar) {
from({ zipTree(project.configurations.compileMacOs.singleFile) }) { into 'macos/' }
from({ zipTree(project.configurations.compileLinux.singleFile) }) { into 'linux/' }
configurations = [
project.configurations.runtime,
project.configurations.shadow
project.configurations.runtime,
project.configurations.shadow
]
manifest {
attributes 'Main-Class': 'com.android.tools.build.bundletool.BundleToolMain'
Expand Down
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
@@ -1 +1 @@
release_version = 1.2.0
release_version = 1.3.0
Loading

0 comments on commit a380c5b

Please sign in to comment.