diff options
| author | Martin Fietz <Martin.Fietz@gmail.com> | 2019-01-27 11:40:24 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-01-27 11:40:24 +0100 |
| commit | 7f37987bda32c7838746246258be3d055018ef1e (patch) | |
| tree | ccbeaaa5bf5b947c20dcd6c4868ae5f41e5eb175 | |
| parent | bcfc951f1bcb42ef51415ca9a7a963d00ac6f947 (diff) | |
| parent | 9fe05d96b90fd7cf3a460cedda1056d5f68b0704 (diff) | |
| download | AntennaPod-7f37987bda32c7838746246258be3d055018ef1e.zip | |
Merge branch 'develop' into android_gradle_330_upgrade
| -rw-r--r-- | app/build.gradle | 22 | ||||
| -rw-r--r-- | app/src/main/AndroidManifest.xml | 10 | ||||
| -rw-r--r-- | build.gradle | 4 |
3 files changed, 9 insertions, 27 deletions
diff --git a/app/build.gradle b/app/build.gradle index d2b60f14e..c53f61088 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -21,20 +21,6 @@ repositories { mavenCentral() } -def getMyVersionName() { - def parsedManifestXml = (new XmlSlurper()) - .parse("${projectDir}/src/main/AndroidManifest.xml") - .declareNamespace(android: "http://schemas.android.com/apk/res/android") - return parsedManifestXml."@android:versionName" -} - -def getMyVersionCode() { - def parsedManifestXml = (new XmlSlurper()) - .parse("${projectDir}/src/main/AndroidManifest.xml") - .declareNamespace(android: "http://schemas.android.com/apk/res/android") - return parsedManifestXml."@android:versionCode".toInteger() -} - android { compileSdkVersion rootProject.ext.compileSdkVersion buildToolsVersion rootProject.ext.buildToolsVersion @@ -43,8 +29,12 @@ android { minSdkVersion rootProject.ext.minSdkVersion targetSdkVersion rootProject.ext.targetSdkVersion multiDexEnabled true - versionCode getMyVersionCode() - versionName "${getMyVersionName()}" + // Version code schema: + // "1.2.3-SNAPSHOT" -> 1020300 + // "1.2.3-RC4" -> 1020304 + // btw I would recommend to autogenerate this + versionCode 1070195 + versionName "1.7.1" testApplicationId "de.test.antennapod" testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" generatedDensities = [] diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 0c3685ed1..216afc6b7 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -1,14 +1,8 @@ <?xml version="1.0" encoding="utf-8"?> <manifest xmlns:android="http://schemas.android.com/apk/res/android" package="de.danoeh.antennapod" - android:installLocation="auto" - android:versionCode="1070195" - android:versionName="1.7.1"> - <!-- - Version code schema: - "1.2.3-SNAPSHOT" -> 1020300 - "1.2.3-RC4" -> 1020304 - --> + android:installLocation="auto"> + <uses-permission android:name="android.permission.INTERNET"/> <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/> <uses-permission android:name="android.permission.WAKE_LOCK"/> diff --git a/build.gradle b/build.gradle index 59db0254d..3759b7db4 100644 --- a/build.gradle +++ b/build.gradle @@ -1,10 +1,8 @@ -// Top-level build file where you can add configuration options common to all sub-projects/modules. - buildscript { repositories { + google() jcenter() mavenCentral() - google() } dependencies { classpath 'com.android.tools.build:gradle:3.3.0' |