Bug 1620145: Part 0 - Set compileSdkVersion to use ANDROID_TARGET_SDK…

…; r=geckoview-reviewers,agi Differential Revision: https://phabricator.services.mozilla.com/D68612 --HG-- extra : moz-landing-system : lando
dothq · Mar 27, 2020 · fa8d4a5 · fa8d4a5
1 parent 940bf90
commit fa8d4a5
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 6 deletions.
diff --git a/build.gradle b/build.gradle
@@ -15,7 +15,7 @@ allprojects {
         topsrcdir = gradle.mozconfig.topsrcdir
         topobjdir = gradle.mozconfig.topobjdir
 
-        compileSdkVersion = 28
+        compileSdkVersion = tryInt(mozconfig.substs.ANDROID_TARGET_SDK)
         targetSdkVersion = tryInt(mozconfig.substs.ANDROID_TARGET_SDK)
         minSdkVersion = tryInt(mozconfig.substs.MOZ_ANDROID_MIN_SDK_VERSION)
         manifestPlaceholders = [

diff --git a/build/moz.configure/android-sdk.configure b/build/moz.configure/android-sdk.configure
@@ -41,7 +41,7 @@ def android_sdk_root(value):
 
 @depends('--help')
 def android_sdk_version(_):
-    return namespace(build_tools_versions=['28.0.3'], target_sdk_version='29')
+    return namespace(build_tools_versions=['29.0.3'], target_sdk_version='29')
 
 
 @depends(android_sdk_root, android_sdk_version)

diff --git a/...le/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/AccessibilityTest.kt b/...le/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/AccessibilityTest.kt
@@ -997,6 +997,7 @@ class AccessibilityTest : BaseSessionTest() {
             override fun onWinStateChanged(event: AccessibilityEvent) { }
 
             @AssertCalled(count = 1)
+            @Suppress("deprecation")
             override fun onFocused(event: AccessibilityEvent) {
                 nodeId = getSourceId(event)
                 var node = createNodeInfo(nodeId)

diff --git a/.../geckoview/src/androidTest/java/org/mozilla/geckoview/test/SelectionActionDelegateTest.kt b/.../geckoview/src/androidTest/java/org/mozilla/geckoview/test/SelectionActionDelegateTest.kt
@@ -239,7 +239,7 @@ class SelectionActionDelegateTest : BaseSessionTest() {
     private fun withClipboard(content: String = "", lambda: () -> Unit) {
         val oldClip = clipboard.primaryClip
         try {
-            clipboard.primaryClip = ClipData.newPlainText("", content)
+            clipboard.setPrimaryClip(ClipData.newPlainText("", content))
 
             sessionRule.addExternalDelegateUntilTestEnd(
                     ClipboardManager.OnPrimaryClipChangedListener::class,
@@ -248,7 +248,7 @@ class SelectionActionDelegateTest : BaseSessionTest() {
                     ClipboardManager.OnPrimaryClipChangedListener {})
             lambda()
         } finally {
-            clipboard.primaryClip = oldClip ?: ClipData.newPlainText("", "")
+            clipboard.setPrimaryClip(oldClip ?: ClipData.newPlainText("", ""))
         }
     }
 

diff --git a/python/mozboot/mozboot/android-packages.txt b/python/mozboot/mozboot/android-packages.txt
@@ -1,5 +1,5 @@
 platform-tools
-build-tools;28.0.3
-platforms;android-28
+build-tools;29.0.3
+platforms;android-29
 emulator
 docs