gradle.patch 2.4 KB

1234567891011121314151617181920212223242526272829303132333435363738394041424344454647484950515253545556575859606162636465666768697071727374757677787980818283848586878889909192939495
  1. From a39b5c7b089c249f1ba04c297babe22d2bcd75f2 Mon Sep 17 00:00:00 2001
  2. From: Georg Koppen <gk@torproject.org>
  3. Date: Sat, 26 Dec 2020 21:17:59 +0000
  4. Subject: [PATCH] test
  5. diff --git a/android/build.gradle b/android/build.gradle
  6. index a8d9bdc..e0eb541 100644
  7. --- a/android/build.gradle
  8. +++ b/android/build.gradle
  9. @@ -7,6 +7,7 @@ buildscript {
  10. mavenLocal()
  11. mavenCentral()
  12. google()
  13. + jcenter()
  14. }
  15. dependencies {
  16. classpath "com.android.tools.build:gradle:${androidplugin}"
  17. @@ -14,11 +15,11 @@ buildscript {
  18. }
  19. android {
  20. - compileSdkVersion 28
  21. + compileSdkVersion 29
  22. defaultConfig {
  23. minSdkVersion 16
  24. - targetSdkVersion 28
  25. + targetSdkVersion 29
  26. versionCode 1
  27. versionName "0.0.3"
  28. consumerProguardFiles 'proguard-rules.pro'
  29. @@ -40,7 +41,9 @@ publishing {
  30. groupId 'com.msopentech.thali.toronionproxy.android'
  31. artifactId 'android'
  32. version '0.0.3'
  33. - artifact(sourceJar)
  34. + afterEvaluate {
  35. + artifact(sourceJar)
  36. + }
  37. artifact("$buildDir/outputs/aar/android-release.aar")
  38. pom.withXml {
  39. def dependenciesNode = asNode().appendNode('dependencies')
  40. diff --git a/android_tor_installer/build.gradle b/android_tor_installer/build.gradle
  41. index 554fd49..92e84d4 100644
  42. --- a/android_tor_installer/build.gradle
  43. +++ b/android_tor_installer/build.gradle
  44. @@ -7,6 +7,7 @@ buildscript {
  45. mavenLocal()
  46. mavenCentral()
  47. google()
  48. + jcenter()
  49. }
  50. dependencies {
  51. classpath "com.android.tools.build:gradle:${androidplugin}"
  52. @@ -14,11 +15,11 @@ buildscript {
  53. }
  54. android {
  55. - compileSdkVersion 28
  56. + compileSdkVersion 29
  57. defaultConfig {
  58. minSdkVersion 16
  59. - targetSdkVersion 28
  60. + targetSdkVersion 29
  61. versionCode 1
  62. versionName "0.0.3"
  63. @@ -48,7 +49,7 @@ repositories {
  64. mavenLocal()
  65. mavenCentral()
  66. google()
  67. - maven { url "https://repo.spring.io/plugins-release" }
  68. + jcenter()
  69. maven { url "https://raw.githubusercontent.com/guardianproject/gpmaven/master" }
  70. }
  71. diff --git a/build.gradle b/build.gradle
  72. index a269024..43b9e13 100644
  73. --- a/build.gradle
  74. +++ b/build.gradle
  75. @@ -8,7 +8,7 @@ subprojects {
  76. repositories {
  77. mavenLocal()
  78. mavenCentral()
  79. - maven { url "https://repo.spring.io/plugins-release" }
  80. + jcenter()
  81. }
  82. }
  83. --
  84. 2.30.0.rc2