From 66fc98ddb787d22787e79fc2e422076a42b64ad4 Mon Sep 17 00:00:00 2001
From: Georg Koppen <gk@torproject.org>
Date: Mon, 18 May 2020 10:12:01 +0000
Subject: [PATCH] Bug 33558: Update TOPL to use updated Android toolchain


diff --git a/android/build.gradle b/android/build.gradle
index a8d9bdc..696f62e 100644
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -7,6 +7,7 @@ buildscript {
         mavenLocal()
         mavenCentral()
         google()
+        maven { url "https://repo.spring.io/plugins-release" }
     }
     dependencies {
         classpath "com.android.tools.build:gradle:${androidplugin}"
@@ -14,11 +15,11 @@ buildscript {
 }
 
 android {
-    compileSdkVersion 28
+    compileSdkVersion 29
 
     defaultConfig {
         minSdkVersion 16
-        targetSdkVersion 28
+        targetSdkVersion 29
         versionCode 1
         versionName "0.0.3"
         consumerProguardFiles 'proguard-rules.pro'
@@ -40,7 +41,9 @@ publishing {
             groupId 'com.msopentech.thali.toronionproxy.android'
             artifactId 'android'
             version '0.0.3'
-            artifact(sourceJar)
+            afterEvaluate {
+              artifact(sourceJar)
+            }
             artifact("$buildDir/outputs/aar/android-release.aar")
             pom.withXml {
                 def dependenciesNode = asNode().appendNode('dependencies')
diff --git a/android_tor_installer/build.gradle b/android_tor_installer/build.gradle
index 554fd49..1913fa9 100644
--- a/android_tor_installer/build.gradle
+++ b/android_tor_installer/build.gradle
@@ -7,6 +7,7 @@ buildscript {
         mavenLocal()
         mavenCentral()
         google()
+        maven { url "https://repo.spring.io/plugins-release" }
     }
     dependencies {
         classpath "com.android.tools.build:gradle:${androidplugin}"
@@ -14,11 +15,11 @@ buildscript {
 }
 
 android {
-    compileSdkVersion 28
+    compileSdkVersion 29
 
     defaultConfig {
         minSdkVersion 16
-        targetSdkVersion 28
+        targetSdkVersion 29
         versionCode 1
         versionName "0.0.3"
 
-- 
2.26.2

