diff --git a/.buckconfig b/.buckconfig index a4c6d696ba66b7..18bc1909ec0766 100644 --- a/.buckconfig +++ b/.buckconfig @@ -1,6 +1,6 @@ [android] - target = android-26 + target = android-28 [download] max_number_of_retries = 3 diff --git a/.circleci/config.yml b/.circleci/config.yml index d80fd6aaf97b02..98e93873b87467 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -28,11 +28,11 @@ aliases: - &restore-cache-android-packages keys: - - v1-android-sdkmanager-packages-api-26-alpha-{{ checksum "scripts/.tests.env" }} + - v1-android-sdkmanager-packages-api-28-alpha-{{ checksum "scripts/.tests.env" }} - &save-cache-android-packages paths: - /opt/android/sdk - key: v1-android-sdkmanager-packages-api-26-alpha-{{ checksum "scripts/.tests.env" }} + key: v1-android-sdkmanager-packages-api-28-alpha-{{ checksum "scripts/.tests.env" }} - &restore-cache-gradle keys: @@ -354,7 +354,7 @@ js_defaults: &js_defaults android_defaults: &android_defaults <<: *defaults docker: - - image: circleci/android:api-26-node8-alpha + - image: circleci/android:api-28-node8-alpha resource_class: "large" environment: - TERM: "dumb" diff --git a/ContainerShip/Dockerfile.android-base b/ContainerShip/Dockerfile.android-base index 5d19bc7f1e9457..552e873a7671fc 100644 --- a/ContainerShip/Dockerfile.android-base +++ b/ContainerShip/Dockerfile.android-base @@ -18,8 +18,8 @@ LABEL maintainer="Héctor Ramos " # set default build arguments ARG SDK_VERSION=sdk-tools-linux-3859397.zip -ARG ANDROID_BUILD_VERSION=26 -ARG ANDROID_TOOLS_VERSION=26.0.3 +ARG ANDROID_BUILD_VERSION=28 +ARG ANDROID_TOOLS_VERSION=28.0.2 ARG BUCK_VERSION=v2018.07.23.01 ARG NDK_VERSION=17b ARG NODE_VERSION=8.10.0 diff --git a/RNTester/android/app/build.gradle b/RNTester/android/app/build.gradle index 229e4c9952207a..af2775dc07140d 100644 --- a/RNTester/android/app/build.gradle +++ b/RNTester/android/app/build.gradle @@ -84,8 +84,8 @@ def enableSeparateBuildPerCPUArchitecture = false def enableProguardInReleaseBuilds = true android { - compileSdkVersion 26 - buildToolsVersion "26.0.3" + compileSdkVersion 28 + buildToolsVersion "28.0.2" defaultConfig { applicationId "com.facebook.react.uiapp" @@ -140,9 +140,9 @@ android { } dependencies { - compile fileTree(dir: 'libs', include: ['*.jar']) - compile 'com.android.support:appcompat-v7:26.1.0' + implementation fileTree(dir: 'libs', include: ['*.jar']) + implementation 'com.android.support:appcompat-v7:27.1.1' // Build React Native from source - compile project(':ReactAndroid') + implementation project(':ReactAndroid') } diff --git a/RNTester/android/app/src/main/java/com/facebook/react/uiapp/RNTesterActivity.java b/RNTester/android/app/src/main/java/com/facebook/react/uiapp/RNTesterActivity.java index 5b55c3b26e5e12..70420d3fc10896 100644 --- a/RNTester/android/app/src/main/java/com/facebook/react/uiapp/RNTesterActivity.java +++ b/RNTester/android/app/src/main/java/com/facebook/react/uiapp/RNTesterActivity.java @@ -14,7 +14,7 @@ import com.facebook.react.ReactActivity; import com.facebook.react.ReactActivityDelegate; -import javax.annotation.Nullable; +import android.support.annotation.Nullable; public class RNTesterActivity extends ReactActivity { public static class RNTesterActivityDelegate extends ReactActivityDelegate { diff --git a/RNTester/android/app/src/main/java/com/facebook/react/uiapp/RNTesterApplication.java b/RNTester/android/app/src/main/java/com/facebook/react/uiapp/RNTesterApplication.java index b5eb40277e89e7..878c9c743d6728 100644 --- a/RNTester/android/app/src/main/java/com/facebook/react/uiapp/RNTesterApplication.java +++ b/RNTester/android/app/src/main/java/com/facebook/react/uiapp/RNTesterApplication.java @@ -18,7 +18,7 @@ import java.util.Arrays; import java.util.List; -import javax.annotation.Nullable; +import android.support.annotation.Nullable; public class RNTesterApplication extends Application implements ReactApplication { private final ReactNativeHost mReactNativeHost = new ReactNativeHost(this) { diff --git a/ReactAndroid/build.gradle b/ReactAndroid/build.gradle index b05e6151391272..a3537d52e87b43 100644 --- a/ReactAndroid/build.gradle +++ b/ReactAndroid/build.gradle @@ -245,8 +245,8 @@ task packageReactNdkLibsForBuck(dependsOn: packageReactNdkLibs, type: Copy) { } android { - compileSdkVersion 26 - buildToolsVersion "26.0.3" + compileSdkVersion 28 + buildToolsVersion "28.0.2" defaultConfig { minSdkVersion 16 @@ -293,30 +293,30 @@ android { } dependencies { - compile fileTree(dir: 'src/main/third-party/java/infer-annotations/', include: ['*.jar']) - compile 'javax.inject:javax.inject:1' - compile 'com.android.support:appcompat-v7:26.1.0' - compile 'com.facebook.fbui.textlayoutbuilder:textlayoutbuilder:1.0.0' - compile 'com.facebook.fresco:fresco:1.10.0' - compile 'com.facebook.fresco:imagepipeline-okhttp3:1.9.0' - compile 'com.facebook.soloader:soloader:0.5.1' - compile 'com.google.code.findbugs:jsr305:3.0.2' - compile 'com.squareup.okhttp3:okhttp:3.10.0' - compile 'com.squareup.okhttp3:okhttp-urlconnection:3.10.0' - compile 'com.squareup.okio:okio:1.14.0' + implementation fileTree(dir: 'src/main/third-party/java/infer-annotations/', include: ['*.jar']) + implementation 'javax.inject:javax.inject:1' + implementation 'com.android.support:appcompat-v7:27.1.1' + api 'com.facebook.fbui.textlayoutbuilder:textlayoutbuilder:1.0.0' + api 'com.facebook.fresco:fresco:1.10.0' + api 'com.facebook.fresco:imagepipeline-okhttp3:1.10.0' + api 'com.facebook.soloader:soloader:0.5.1' + api 'com.google.code.findbugs:jsr305:3.0.2' + api 'com.squareup.okhttp3:okhttp:3.10.0' + api 'com.squareup.okhttp3:okhttp-urlconnection:3.10.0' + api 'com.squareup.okio:okio:1.14.0' compile 'org.webkit:android-jsc:r174650' - testCompile "junit:junit:${JUNIT_VERSION}" - testCompile "org.powermock:powermock-api-mockito:${POWERMOCK_VERSION}" - testCompile "org.powermock:powermock-module-junit4-rule:${POWERMOCK_VERSION}" - testCompile "org.powermock:powermock-classloading-xstream:${POWERMOCK_VERSION}" - testCompile "org.mockito:mockito-core:${MOCKITO_CORE_VERSION}" - testCompile "org.easytesting:fest-assert-core:${FEST_ASSERT_CORE_VERSION}" - testCompile "org.robolectric:robolectric:${ROBOLECTRIC_VERSION}" - - androidTestCompile fileTree(dir: 'src/main/third-party/java/buck-android-support/', include: ['*.jar']) - androidTestCompile 'com.android.support.test:runner:0.3' - androidTestCompile "org.mockito:mockito-core:${MOCKITO_CORE_VERSION}" + testImplementation "junit:junit:${JUNIT_VERSION}" + testImplementation "org.powermock:powermock-api-mockito:${POWERMOCK_VERSION}" + testImplementation "org.powermock:powermock-module-junit4-rule:${POWERMOCK_VERSION}" + testImplementation "org.powermock:powermock-classloading-xstream:${POWERMOCK_VERSION}" + testImplementation "org.mockito:mockito-core:${MOCKITO_CORE_VERSION}" + testImplementation "org.easytesting:fest-assert-core:${FEST_ASSERT_CORE_VERSION}" + testImplementation "org.robolectric:robolectric:${ROBOLECTRIC_VERSION}" + + androidTestImplementation fileTree(dir: 'src/main/third-party/java/buck-android-support/', include: ['*.jar']) + androidTestImplementation 'com.android.support.test:runner:0.3' + androidTestImplementation "org.mockito:mockito-core:${MOCKITO_CORE_VERSION}" } apply from: 'release.gradle' diff --git a/ReactAndroid/src/main/java/com/facebook/react/BUCK b/ReactAndroid/src/main/java/com/facebook/react/BUCK index 743bb34bb69448..1c8907f2bf2a7e 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/BUCK +++ b/ReactAndroid/src/main/java/com/facebook/react/BUCK @@ -13,6 +13,7 @@ rn_android_library( react_native_dep("java/com/facebook/systrace:systrace"), react_native_dep("libraries/fbcore/src/main/java/com/facebook/common/logging:logging"), react_native_dep("libraries/soloader/java/com/facebook/soloader:soloader"), + react_native_dep("third-party/android/support-annotations:android-support-annotations"), react_native_dep("third-party/java/infer-annotations:infer-annotations"), react_native_dep("third-party/java/jsr-305:jsr-305"), react_native_target("java/com/facebook/debug/holder:holder"), diff --git a/ReactAndroid/src/main/third-party/android/support-annotations/BUCK b/ReactAndroid/src/main/third-party/android/support-annotations/BUCK index cad12896cee525..80a5ef65b053f4 100644 --- a/ReactAndroid/src/main/third-party/android/support-annotations/BUCK +++ b/ReactAndroid/src/main/third-party/android/support-annotations/BUCK @@ -6,6 +6,6 @@ prebuilt_jar( remote_file( name = "support-annotations-binary.jar", - sha1 = "0814258103cf26a15fcc26ecce35f5b7d24b73f8", - url = "mvn:com.android.support:support-annotations:jar:26.1.0", + sha1 = "39ded76b5e1ce1c5b2688e1d25cdc20ecee32007", + url = "mvn:com.android.support:support-annotations:jar:27.1.1", ) diff --git a/ReactAndroid/src/main/third-party/android/support/v4/BUCK b/ReactAndroid/src/main/third-party/android/support/v4/BUCK index e816510b9a807f..27aec407f2907b 100644 --- a/ReactAndroid/src/main/third-party/android/support/v4/BUCK +++ b/ReactAndroid/src/main/third-party/android/support/v4/BUCK @@ -5,6 +5,7 @@ android_library( ":android-lifecycle-common", ":android-lifecycle-core", ":android-lifecycle-runtime", + ":android-lifecycle-viewmodel", ":lib-support-v4-support-compat", ":lib-support-v4-support-core-ui", ":lib-support-v4-support-core-utils", @@ -28,6 +29,11 @@ android_prebuilt_aar( aar = ":android-lifecycle-runtime-aar", ) +android_prebuilt_aar( + name = "android-lifecycle-viewmodel", + aar = ":android-lifecycle-viewmodel-aar", +) + android_prebuilt_aar( name = "lib-support-v4-support-compat", aar = ":lib-support-v4-support-compat-aar", @@ -55,48 +61,54 @@ android_prebuilt_aar( remote_file( name = "android-lifecycle-runtime-aar", - sha1 = "30c60a8a357ee1321ffd0c9f08ef54b24045cd10", - url = "mvn:android.arch.lifecycle:runtime:aar:1.0.0", + sha1 = "95428e5f6bf6875a6a1125d2157c3836a1a837f5", + url = "mvn:android.arch.lifecycle:runtime:aar:1.1.0", ) remote_file( name = "android-lifecycle-common.jar", - sha1 = "e414a4cb28434e25c4f6aa71426eb20cf4874ae9", - url = "mvn:android.arch.lifecycle:common:jar:1.0.0", + sha1 = "0edf3f7bfb84a7521d0599efa3b0113a0ee90f85", + url = "mvn:android.arch.lifecycle:common:jar:1.1.0", ) remote_file( name = "android-lifecycle-core.jar", - sha1 = "a2d487452376193fc8c103dd2b9bd5f2b1b44563", - url = "mvn:android.arch.core:common:jar:1.0.0", + sha1 = "8007981f7d7540d89cd18471b8e5dcd2b4f99167", + url = "mvn:android.arch.core:common:jar:1.1.0", +) + +remote_file( + name = "android-lifecycle-viewmodel-aar", + sha1 = "74ee369b874da61b5b81bebd7b8df0c2577309c8", + url = "mvn:android.arch.lifecycle:viewmodel:aar:1.1.0", ) remote_file( name = "lib-support-v4-support-compat-aar", - sha1 = "1e1c8ffc01d277d8f01dfd11d5d2ce3a2af4b98c", - url = "mvn:com.android.support:support-compat:aar:26.1.0", + sha1 = "a55ad550d0b84c7fec7ecca012690636062c0e64", + url = "mvn:com.android.support:support-compat:aar:27.1.1", ) remote_file( name = "lib-support-v4-support-core-utils-aar", - sha1 = "1bfaae21c4d5c5532c5e732071e9ce234cd58cff", - url = "mvn:com.android.support:support-core-utils:aar:26.1.0", + sha1 = "b3a7a4040fda0c5138dbc8c477103b6723b9dbe6", + url = "mvn:com.android.support:support-core-utils:aar:27.1.1", ) remote_file( name = "lib-support-v4-support-core-ui-aar", - sha1 = "e306308d54052a1ded7bf9c2f5c2fdf5152a1f22", - url = "mvn:com.android.support:support-core-ui:aar:26.1.0", + sha1 = "f9acdb8a4c3a9fe883fd7fa5efd3f0426bb9dcda", + url = "mvn:com.android.support:support-core-ui:aar:27.1.1", ) remote_file( name = "lib-support-v4-support-media-compat-aar", - sha1 = "09fb587f27cde19aa8f2e50c5c9ee645d9aec44d", - url = "mvn:com.android.support:support-media-compat:aar:26.1.0", + sha1 = "10e309e2cc22ff4cab30bd5f573e4bb30be707ad", + url = "mvn:com.android.support:support-media-compat:aar:27.1.1", ) remote_file( name = "lib-support-v4-support-fragment-aar", - sha1 = "ddacf369bb98dd6558606558de8ddcd53895cf91", - url = "mvn:com.android.support:support-fragment:aar:26.1.0", + sha1 = "eb8053ebf038b7561c29e5e8964664fac05f375e", + url = "mvn:com.android.support:support-fragment:aar:27.1.1", ) diff --git a/ReactAndroid/src/main/third-party/android/support/v7/appcompat-orig/BUCK b/ReactAndroid/src/main/third-party/android/support/v7/appcompat-orig/BUCK index 1dda81db73235d..f8c5049425dd2a 100644 --- a/ReactAndroid/src/main/third-party/android/support/v7/appcompat-orig/BUCK +++ b/ReactAndroid/src/main/third-party/android/support/v7/appcompat-orig/BUCK @@ -56,6 +56,6 @@ python_binary( remote_file( name = "appcompat-binary-aar", - sha1 = "da5771a9ac6e8f3a461360eed3c6f921dc7580fd", - url = "mvn:com.android.support:appcompat-v7:aar:26.1.0", + sha1 = "22b1ef4ff9ef1a3513c18eb132d597eac6ef1a86", + url = "mvn:com.android.support:appcompat-v7:aar:27.1.1", ) diff --git a/appveyor.yml b/appveyor.yml index 560abe5ed0803f..823aa599c04d11 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,8 +1,8 @@ environment: ANDROID_HOME: "C:\\android-sdk-windows" ANDROID_NDK: "C:\\android-sdk-windows\\android-ndk-r17b" - ANDROID_BUILD_VERSION: 26 - ANDROID_TOOLS_VERSION: 26.0.3 + ANDROID_BUILD_VERSION: 28 + ANDROID_TOOLS_VERSION: 28.0.2 GRADLE_OPTS: -Dorg.gradle.daemon=false diff --git a/build.gradle b/build.gradle index 71634a0cbefc06..e039a8902cb941 100644 --- a/build.gradle +++ b/build.gradle @@ -7,13 +7,10 @@ buildscript { repositories { jcenter() mavenLocal() - maven { - url 'https://maven.google.com/' - name 'Google' - } + google() } dependencies { - classpath 'com.android.tools.build:gradle:2.3.3' + classpath 'com.android.tools.build:gradle:3.1.4' classpath 'de.undercouch:gradle-download-task:3.4.3' // NOTE: Do not place your application dependencies here; they belong @@ -25,10 +22,7 @@ allprojects { repositories { jcenter() mavenLocal() - maven { - url 'https://maven.google.com/' - name 'Google' - } + google() def androidSdk = System.getenv("ANDROID_SDK") maven { diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index e318290e619bb6..04e40838dbf8f4 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ 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-4.6-all.zip diff --git a/local-cli/link/__fixtures__/android/build.gradle b/local-cli/link/__fixtures__/android/build.gradle index 9eb0a44ae5245f..4dd26f8e088024 100644 --- a/local-cli/link/__fixtures__/android/build.gradle +++ b/local-cli/link/__fixtures__/android/build.gradle @@ -1,5 +1,5 @@ dependencies { - compile fileTree(dir: "libs", include: ["*.jar"]) - compile "com.android.support:appcompat-v7:26.1.0" - compile "com.facebook.react:react-native:+" + implementation fileTree(dir: "libs", include: ["*.jar"]) + implementation "com.android.support:appcompat-v7:27.1.1" + implementation "com.facebook.react:react-native:+" } diff --git a/local-cli/link/__fixtures__/android/patchedBuild.gradle b/local-cli/link/__fixtures__/android/patchedBuild.gradle index f6b9a22054cf0f..425aaaf7f44427 100644 --- a/local-cli/link/__fixtures__/android/patchedBuild.gradle +++ b/local-cli/link/__fixtures__/android/patchedBuild.gradle @@ -1,9 +1,9 @@ dependencies { - compile project(':test') - compile(project(':test2')) { + implementation project(':test') + implementation(project(':test2')) { exclude(group: 'org.unwanted', module: 'test10') } - compile fileTree(dir: "libs", include: ["*.jar"]) - compile "com.android.support:appcompat-v7:26.1.0" - compile "com.facebook.react:react-native:+" + implementation fileTree(dir: "libs", include: ["*.jar"]) + implementation "com.android.support:appcompat-v7:27.1.1" + implementation "com.facebook.react:react-native:+" } diff --git a/local-cli/link/__tests__/android/makeBuildPatch.spec.js b/local-cli/link/__tests__/android/makeBuildPatch.spec.js index 51873daf1d0236..5b87b8d2990122 100644 --- a/local-cli/link/__tests__/android/makeBuildPatch.spec.js +++ b/local-cli/link/__tests__/android/makeBuildPatch.spec.js @@ -26,12 +26,12 @@ describe('makeBuildPatch', () => { it('should make a correct patch', () => { const {patch} = makeBuildPatch(name); - expect(patch).toBe(` compile project(':${name}')\n`); + expect(patch).toBe(` implementation project(':${name}')\n`); }); it('should make a correct install check pattern', () => { const {installPattern} = makeBuildPatch(name); - const match = `/\\s{4}(compile)(\\(|\\s)(project)\\(\\':${name}\\'\\)(\\)|\\s)/`; + const match = `/\\s{4}(implementation)(\\(|\\s)(project)\\(\\':${name}\\'\\)(\\)|\\s)/`; expect(installPattern.toString()).toBe(match); }); }); @@ -39,12 +39,12 @@ describe('makeBuildPatch', () => { describe('makeBuildPatchWithScopedPackage', () => { it('should make a correct patch', () => { const {patch} = makeBuildPatch(scopedName); - expect(patch).toBe(` compile project(':${normalizedScopedName}')\n`); + expect(patch).toBe(` implementation project(':${normalizedScopedName}')\n`); }); it('should make a correct install check pattern', () => { const {installPattern} = makeBuildPatch(scopedName); - const match = `/\\s{4}(compile)(\\(|\\s)(project)\\(\\':${normalizedScopedName}\\'\\)(\\)|\\s)/`; + const match = `/\\s{4}(implementation)(\\(|\\s)(project)\\(\\':${normalizedScopedName}\\'\\)(\\)|\\s)/`; expect(installPattern.toString()).toBe(match); }); }); diff --git a/local-cli/link/android/patches/makeBuildPatch.js b/local-cli/link/android/patches/makeBuildPatch.js index dfaab8f6998bfe..246f3358540df6 100644 --- a/local-cli/link/android/patches/makeBuildPatch.js +++ b/local-cli/link/android/patches/makeBuildPatch.js @@ -12,12 +12,12 @@ const normalizeProjectName = require('./normalizeProjectName'); module.exports = function makeBuildPatch(name) { const normalizedProjectName = normalizeProjectName(name); const installPattern = new RegExp( - `\\s{4}(compile)(\\(|\\s)(project)\\(\\\':${normalizedProjectName}\\\'\\)(\\)|\\s)`, + `\\s{4}(implementation)(\\(|\\s)(project)\\(\\\':${normalizedProjectName}\\\'\\)(\\)|\\s)`, ); return { installPattern, pattern: /[^ \t]dependencies {(\r\n|\n)/, - patch: ` compile project(':${normalizedProjectName}')\n`, + patch: ` implementation project(':${normalizedProjectName}')\n`, }; }; diff --git a/local-cli/templates/HelloWorld/android/app/build.gradle b/local-cli/templates/HelloWorld/android/app/build.gradle index 31a0da9a576ea7..793eae821101a8 100644 --- a/local-cli/templates/HelloWorld/android/app/build.gradle +++ b/local-cli/templates/HelloWorld/android/app/build.gradle @@ -137,9 +137,9 @@ android { } dependencies { - compile fileTree(dir: "libs", include: ["*.jar"]) - compile "com.android.support:appcompat-v7:${rootProject.ext.supportLibVersion}" - compile "com.facebook.react:react-native:+" // From node_modules + implementation fileTree(dir: "libs", include: ["*.jar"]) + implementation "com.android.support:appcompat-v7:${rootProject.ext.supportLibVersion}" + implementation "com.facebook.react:react-native:+" // From node_modules } // Run this once to be able to run the application with BUCK diff --git a/local-cli/templates/HelloWorld/android/build.gradle b/local-cli/templates/HelloWorld/android/build.gradle index 49569e4db5f7e7..21100711bdc931 100644 --- a/local-cli/templates/HelloWorld/android/build.gradle +++ b/local-cli/templates/HelloWorld/android/build.gradle @@ -3,13 +3,10 @@ buildscript { repositories { jcenter() - maven { - url 'https://maven.google.com/' - name 'Google' - } + google() } dependencies { - classpath 'com.android.tools.build:gradle:2.3.3' + classpath 'com.android.tools.build:gradle:3.1.4' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files @@ -24,17 +21,14 @@ allprojects { // All of React Native (JS, Obj-C sources, Android binaries) is installed from npm url "$rootDir/../node_modules/react-native/android" } - maven { - url 'https://maven.google.com/' - name 'Google' - } + google() } } ext { - buildToolsVersion = "26.0.3" + buildToolsVersion = "28.0.2" minSdkVersion = 16 - compileSdkVersion = 26 + compileSdkVersion = 28 targetSdkVersion = 26 - supportLibVersion = "26.1.0" + supportLibVersion = "27.1.1" } diff --git a/local-cli/templates/HelloWorld/android/gradle/wrapper/gradle-wrapper.properties b/local-cli/templates/HelloWorld/android/gradle/wrapper/gradle-wrapper.properties index b6517bb1d16502..3f0f9be633f5a4 100644 --- a/local-cli/templates/HelloWorld/android/gradle/wrapper/gradle-wrapper.properties +++ b/local-cli/templates/HelloWorld/android/gradle/wrapper/gradle-wrapper.properties @@ -2,4 +2,4 @@ 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-4.6-all.zip diff --git a/scripts/.tests.env b/scripts/.tests.env index e9d918ec476ec1..50341a67b888d7 100644 --- a/scripts/.tests.env +++ b/scripts/.tests.env @@ -4,11 +4,11 @@ ## ANDROID ## # Android SDK Build Tools revision -export ANDROID_SDK_BUILD_TOOLS_REVISION=26.0.3 +export ANDROID_SDK_BUILD_TOOLS_REVISION=28.0.2 # Android API Level we build with -export ANDROID_SDK_BUILD_API_LEVEL="26" +export ANDROID_SDK_BUILD_API_LEVEL="28" # Google APIs for Android level -export ANDROID_GOOGLE_API_LEVEL="23" +export ANDROID_GOOGLE_API_LEVEL="24" # Minimum Android API Level we target export ANDROID_SDK_TARGET_API_LEVEL="19" # Android Virtual Device name