diff options
author | android-build-team Robot <android-build-team-robot@google.com> | 2018-03-13 09:43:45 +0000 |
---|---|---|
committer | android-build-team Robot <android-build-team-robot@google.com> | 2018-03-13 09:43:45 +0000 |
commit | cf5b3a3c0b141d1dcfa6dfe1f1a97d308c709df4 (patch) | |
tree | b2f362e1b15621a2247fd2c3be0e4607d6784290 | |
parent | f9c982c0ab9bb5ae6840791f92f2e9f828989e64 (diff) | |
parent | 475db106115d4f25f0e41612a2a71a0cfe83ab38 (diff) | |
download | multidex-security-pi-release.tar.gz |
Snap for 4651078 from 475db106115d4f25f0e41612a2a71a0cfe83ab38 to pi-releaseandroid-wear-9.0.0_r9android-wear-9.0.0_r8android-wear-9.0.0_r7android-wear-9.0.0_r6android-wear-9.0.0_r5android-wear-9.0.0_r4android-wear-9.0.0_r34android-wear-9.0.0_r33android-wear-9.0.0_r32android-wear-9.0.0_r31android-wear-9.0.0_r30android-wear-9.0.0_r3android-wear-9.0.0_r29android-wear-9.0.0_r28android-wear-9.0.0_r27android-wear-9.0.0_r26android-wear-9.0.0_r25android-wear-9.0.0_r24android-wear-9.0.0_r23android-wear-9.0.0_r22android-wear-9.0.0_r21android-wear-9.0.0_r20android-wear-9.0.0_r2android-wear-9.0.0_r19android-wear-9.0.0_r18android-wear-9.0.0_r17android-wear-9.0.0_r16android-wear-9.0.0_r15android-wear-9.0.0_r14android-wear-9.0.0_r13android-wear-9.0.0_r12android-wear-9.0.0_r11android-wear-9.0.0_r10android-wear-9.0.0_r1android-vts-9.0_r9android-vts-9.0_r8android-vts-9.0_r7android-vts-9.0_r6android-vts-9.0_r5android-vts-9.0_r4android-vts-9.0_r19android-vts-9.0_r18android-vts-9.0_r17android-vts-9.0_r16android-vts-9.0_r15android-vts-9.0_r14android-vts-9.0_r13android-vts-9.0_r12android-vts-9.0_r11android-vts-9.0_r10android-security-9.0.0_r76android-security-9.0.0_r75android-security-9.0.0_r74android-security-9.0.0_r73android-security-9.0.0_r72android-security-9.0.0_r71android-security-9.0.0_r70android-security-9.0.0_r69android-security-9.0.0_r68android-security-9.0.0_r67android-security-9.0.0_r66android-security-9.0.0_r65android-security-9.0.0_r64android-security-9.0.0_r63android-security-9.0.0_r62android-cts-9.0_r9android-cts-9.0_r8android-cts-9.0_r7android-cts-9.0_r6android-cts-9.0_r5android-cts-9.0_r4android-cts-9.0_r3android-cts-9.0_r20android-cts-9.0_r2android-cts-9.0_r19android-cts-9.0_r18android-cts-9.0_r17android-cts-9.0_r16android-cts-9.0_r15android-cts-9.0_r14android-cts-9.0_r13android-cts-9.0_r12android-cts-9.0_r11android-cts-9.0_r10android-cts-9.0_r1android-9.0.0_r9android-9.0.0_r8android-9.0.0_r7android-9.0.0_r61android-9.0.0_r60android-9.0.0_r6android-9.0.0_r59android-9.0.0_r58android-9.0.0_r57android-9.0.0_r56android-9.0.0_r55android-9.0.0_r54android-9.0.0_r53android-9.0.0_r52android-9.0.0_r51android-9.0.0_r50android-9.0.0_r5android-9.0.0_r49android-9.0.0_r48android-9.0.0_r3android-9.0.0_r2android-9.0.0_r18android-9.0.0_r17android-9.0.0_r10android-9.0.0_r1security-pi-releasepie-vts-releasepie-security-releasepie-s2-releasepie-release-2pie-releasepie-r2-s2-releasepie-r2-s1-releasepie-r2-releasepie-platform-releasepie-gsipie-cuttlefish-testingpie-cts-release
Change-Id: Id57ae972986129904bf3712e025ca3098795ab16
-rw-r--r-- | build.gradle | 2 | ||||
-rw-r--r-- | instrumentation/AndroidManifest.xml | 2 | ||||
-rw-r--r-- | instrumentation/src/com/android/test/runner/MultiDexTestRunner.java | 2 | ||||
-rw-r--r-- | library/AndroidManifest.xml | 2 | ||||
-rw-r--r-- | library/src/androidx/multidex/MultiDex.java (renamed from library/src/android/support/multidex/MultiDex.java) | 2 | ||||
-rw-r--r-- | library/src/androidx/multidex/MultiDexApplication.java (renamed from library/src/android/support/multidex/MultiDexApplication.java) | 2 | ||||
-rw-r--r-- | library/src/androidx/multidex/MultiDexExtractor.java (renamed from library/src/android/support/multidex/MultiDexExtractor.java) | 2 | ||||
-rw-r--r-- | library/src/androidx/multidex/ZipUtil.java (renamed from library/src/android/support/multidex/ZipUtil.java) | 2 | ||||
-rw-r--r-- | library/test/src/androidx/multidex/MultiDexTest.java (renamed from library/test/src/android/support/multidex/MultiDexTest.java) | 2 | ||||
-rw-r--r-- | library/test/src/androidx/multidex/ZipEntryReader.java (renamed from library/test/src/android/support/multidex/ZipEntryReader.java) | 2 | ||||
-rw-r--r-- | library/test/src/androidx/multidex/ZipUtilTest.java (renamed from library/test/src/android/support/multidex/ZipUtilTest.java) | 4 | ||||
-rw-r--r-- | version.gradle | 2 |
12 files changed, 13 insertions, 13 deletions
diff --git a/build.gradle b/build.gradle index b9af213..e35adf7 100644 --- a/build.gradle +++ b/build.gradle @@ -87,7 +87,7 @@ subprojects { apply plugin: 'maven' version = rootProject.multidexVersion - group = 'com.android.support' + group = 'androidx.multidex' dist.dependsOn project.tasks.uploadArchives diff --git a/instrumentation/AndroidManifest.xml b/instrumentation/AndroidManifest.xml index 7b9f92c..cf32396 100644 --- a/instrumentation/AndroidManifest.xml +++ b/instrumentation/AndroidManifest.xml @@ -14,5 +14,5 @@ limitations under the License. --> <manifest xmlns:android="http://schemas.android.com/apk/res/android" - package="android.support.multidex.instrumentation"> + package="androidx.multidex.instrumentation"> </manifest> diff --git a/instrumentation/src/com/android/test/runner/MultiDexTestRunner.java b/instrumentation/src/com/android/test/runner/MultiDexTestRunner.java index d6931d1..02b81c8 100644 --- a/instrumentation/src/com/android/test/runner/MultiDexTestRunner.java +++ b/instrumentation/src/com/android/test/runner/MultiDexTestRunner.java @@ -17,7 +17,7 @@ package com.android.test.runner; import android.os.Bundle; -import android.support.multidex.MultiDex; +import androidx.multidex.MultiDex; import android.test.InstrumentationTestRunner; /** diff --git a/library/AndroidManifest.xml b/library/AndroidManifest.xml index 781e6a7..3a28469 100644 --- a/library/AndroidManifest.xml +++ b/library/AndroidManifest.xml @@ -14,5 +14,5 @@ limitations under the License. --> <manifest xmlns:android="http://schemas.android.com/apk/res/android" - package="android.support.multidex"> + package="androidx.multidex"> </manifest> diff --git a/library/src/android/support/multidex/MultiDex.java b/library/src/androidx/multidex/MultiDex.java index 562311c..69ff889 100644 --- a/library/src/android/support/multidex/MultiDex.java +++ b/library/src/androidx/multidex/MultiDex.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package android.support.multidex; +package androidx.multidex; import android.app.Application; import android.app.Instrumentation; diff --git a/library/src/android/support/multidex/MultiDexApplication.java b/library/src/androidx/multidex/MultiDexApplication.java index 8524646..4c759e3 100644 --- a/library/src/android/support/multidex/MultiDexApplication.java +++ b/library/src/androidx/multidex/MultiDexApplication.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package android.support.multidex; +package androidx.multidex; import android.app.Application; import android.content.Context; diff --git a/library/src/android/support/multidex/MultiDexExtractor.java b/library/src/androidx/multidex/MultiDexExtractor.java index f0fd6d4..2b96113 100644 --- a/library/src/android/support/multidex/MultiDexExtractor.java +++ b/library/src/androidx/multidex/MultiDexExtractor.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package android.support.multidex; +package androidx.multidex; import android.content.Context; import android.content.SharedPreferences; diff --git a/library/src/android/support/multidex/ZipUtil.java b/library/src/androidx/multidex/ZipUtil.java index cd518cc..fc33623 100644 --- a/library/src/android/support/multidex/ZipUtil.java +++ b/library/src/androidx/multidex/ZipUtil.java @@ -18,7 +18,7 @@ * ZipConstants from android libcore. */ -package android.support.multidex; +package androidx.multidex; import java.io.File; import java.io.IOException; diff --git a/library/test/src/android/support/multidex/MultiDexTest.java b/library/test/src/androidx/multidex/MultiDexTest.java index 62bdc30..656b12a 100644 --- a/library/test/src/android/support/multidex/MultiDexTest.java +++ b/library/test/src/androidx/multidex/MultiDexTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package android.support.multidex; +package androidx.multidex; import org.junit.Assert; import org.junit.Test; diff --git a/library/test/src/android/support/multidex/ZipEntryReader.java b/library/test/src/androidx/multidex/ZipEntryReader.java index c10bec5..a16e265 100644 --- a/library/test/src/android/support/multidex/ZipEntryReader.java +++ b/library/test/src/androidx/multidex/ZipEntryReader.java @@ -18,7 +18,7 @@ * ZipConstants from android libcore. */ -package android.support.multidex; +package androidx.multidex; import java.io.IOException; import java.nio.ByteBuffer; diff --git a/library/test/src/android/support/multidex/ZipUtilTest.java b/library/test/src/androidx/multidex/ZipUtilTest.java index 985d97f..39a59ac 100644 --- a/library/test/src/android/support/multidex/ZipUtilTest.java +++ b/library/test/src/androidx/multidex/ZipUtilTest.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package android.support.multidex; +package androidx.multidex; -import android.support.multidex.ZipUtil.CentralDirectory; +import androidx.multidex.ZipUtil.CentralDirectory; import org.junit.Assert; import org.junit.BeforeClass; diff --git a/version.gradle b/version.gradle index f9f6e1f..85e088f 100644 --- a/version.gradle +++ b/version.gradle @@ -14,4 +14,4 @@ * limitations under the License. */ -ext.multidexVersion = '1.0.3' +ext.multidexVersion = '2.0.0' |