diff options
| author | jkoan <jkoan@gmx.de> | 2021-02-20 08:12:45 +0100 |
|---|---|---|
| committer | jkoan <jkoan@gmx.de> | 2021-02-20 08:12:45 +0100 |
| commit | c43428f11f27af2557ff63775f83f97e66cafa1e (patch) | |
| tree | f9ddc2b0f2f56884234fe28b41a750644491f780 | |
| parent | f7f9b1617b7fb897bfd180d90cc2c651211bad7f (diff) | |
| download | navit-c43428f11f27af2557ff63775f83f97e66cafa1e.tar.gz | |
fixed:android:build:Fixed the apk outputname and the corresponding locations within the scripts
| -rw-r--r-- | .circleci/config.yml | 8 | ||||
| -rw-r--r-- | build.gradle | 3 | ||||
| -rw-r--r-- | fastlane/Fastfile | 2 |
3 files changed, 8 insertions, 5 deletions
diff --git a/.circleci/config.yml b/.circleci/config.yml index 9e4c7f88a..7b9367bf3 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -107,19 +107,19 @@ jobs: command: ./gradlew generateDebugJavadoc - store_artifacts: name: Store APK - path: navit/android/build/outputs/apk + path: build/outputs/apk destination: apk - store_artifacts: name: Store logs - path: navit/android/build/outputs/logs + path: build/outputs/logs destination: logs - store_artifacts: name: Store Javadoc - path: navit/android/build/outputs/docs/javadoc + path: build/outputs/docs/javadoc destination: doc - store_artifacts: name: Store Lint reports - path: navit/android/build/reports + path: build/reports destination: reports - store_test_results: path: test-results diff --git a/build.gradle b/build.gradle index 35e6be898..5537dc7c1 100644 --- a/build.gradle +++ b/build.gradle @@ -117,6 +117,9 @@ android { } } applicationVariants.all { variant -> + variant.outputs.all { + outputFileName = "navit-${variant.buildType.name}.apk" + } // create tasks to generate Javadocs task("generate${variant.name.capitalize()}Javadoc", type: Javadoc) { source = android.sourceSets.main.java.srcDirs diff --git a/fastlane/Fastfile b/fastlane/Fastfile index 5d8e2d734..edb4fd4f7 100644 --- a/fastlane/Fastfile +++ b/fastlane/Fastfile @@ -40,7 +40,7 @@ platform :android do if isOnMasterBranch upload_to_play_store( track: 'beta', json_key: 'key.json', - apk: 'navit/android/build/outputs/apk/release/android-release.apk', + apk: 'build/outputs/apk/release/navit-release.apk', package_name: 'org.navitproject.navit' ) else |