Android api level (#1992)

* bump * branch * api29 * update-licenses * update-licenses * update-licenses * try * gradle * _java * api-29-node * rm * ndk * jv11 * buildToolsVersion * node * sha * update * 2 * node * 30 * 29 * experimental * experimentalno * addmodules * ndkagain * unrecognixed * ee * update * JAVA_OPTS * javax * ? * ndk? * node? * circleci
MetaMask · Nov 17, 2020 · 0638c7c · 0638c7c
1 parent a314254
commit 0638c7c
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 8 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -114,17 +114,17 @@ jobs:
     working_directory:  ~/MetaMask
     environment:
       JAVA_OPTS: "-Xms512m -Xmx1024m"
-      _JAVA_OPTIONS: "-XX:+UnlockExperimentalVMOptions -XX:+UseCGroupMemoryLimitForHeap"
+      _JAVA_OPTIONS: "-XX:+UnlockExperimentalVMOptions -XX:+UseContainerSupport"
       GRADLE_OPTS: '-Dorg.gradle.jvmargs="-Xmx2048m -XX:+HeapDumpOnOutOfMemoryError"'
     docker:
-      - image: circleci/android:api-28-node8-alpha
+      - image: circleci/android:api-29-node
     steps:
       - checkout
       - attach_workspace:
           at: .
       - run:
           name: build:accept-android-licenses
-          command: (echo y; echo y; echo y; echo y; echo y; echo y) | $ANDROID_HOME/tools/bin/sdkmanager --licenses
+          command: sdkmanager --licenses
       - run:
           name: build:pre-release
           command:

diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
@@ -18,7 +18,7 @@
 		android:theme="@style/AppTheme"
 		android:hardwareAccelerated="true"
 		android:usesCleartextTraffic="${isDebug}"
-		tools:targetApi="28"
+		tools:targetApi="29"
 		tools:ignore="GoogleAppIndexingWarning"
 		android:networkSecurityConfig="@xml/react_native_config"
 	>

diff --git a/android/build.gradle b/android/build.gradle
@@ -3,10 +3,9 @@
 buildscript {
 
 	ext {
-		buildToolsVersion = "28.0.3"
 		minSdkVersion = 19
 		compileSdkVersion = 29
-		targetSdkVersion = 28
+		targetSdkVersion = 29
 		kotlin_version = "1.3.50"
 		kotlinVersion = "$kotlin_version"
 	}
@@ -56,7 +55,6 @@ allprojects {
 				if (project.hasProperty("android")) {
 					android {
 						compileSdkVersion = rootProject.ext.compileSdkVersion
-						buildToolsVersion = rootProject.ext.buildToolsVersion
 					}
 				}
 		}

diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/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-6.1.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-all.zip