fixed:android:build:Fixed the apk outputname and the corresponding lo…

…cations within the scripts
navit-gps · Feb 20, 2021 · c43428f · c43428f
1 parent f7f9b16
commit c43428f
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 5 deletions.
diff --git 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
@@ -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
@@ -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