Update build.gradle

.gitignore

@@ -1,48 +1,83 @@
-*~
-
-# Project specific
+##############
+### Project ##
 app/src/main/res/raw/changelog.md
 app/src/main/res/raw/contributors.md
 app/src/main/res/raw/license.md
 app/src/main/res/raw/readme.md
 app/src/main/res/raw/contributors.txt
 
+##############
+### Common ###
+*~*
+tmp/
+*.tmp
+*.bak
+*.log
 
+################
+### Intellij ###
+# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio
+*.iml
+/out/
 
-# Gradle
-.gradle/
+.idea/
+# if you remove the above rule, at least ignore the following:
+## User-specific stuff:
+# .idea/workspace.xml
+# .idea/tasks.xml
+# .idea/dictionaries
+## Sensitive or high-churn files:
+# .idea/dataSources.ids
+# .idea/dataSources.xml
+# .idea/sqlDataSources.xml
+# .idea/dynamic.xml
+# .idea/uiDesigner.xml
+
+# Gradle:
+# .idea/gradle.xml
+# .idea/libraries
+
+## File-based project format:
+*.ipr
+*.iws
+
+### Gradle ###
 .gradle
 build/
-/*/build/
+gradle-app.setting
 
-# User-specific configurations
-local.properties
-crowdin.yaml
+# Avoid ignoring Gradle wrapper jar file (.jar files are usually ignored)
+!gradle-wrapper.jar
 
-.idea
-.idea/libraries/
-.idea/runConfigurations.xml
-.idea/gradle.xml
-.idea/workspace.xml
-.idea/tasks.xml
-.idea/.name
-.idea/compiler.xml
-.idea/copyright/profiles_settings.xml
-.idea/encodings.xml
-.idea/misc.xml
-.idea/modules.xml
-.idea/scopes/scope_settings.xml
-.idea/vcs.xml
-*.iml
+###############
+### Eclipse ###
+#.project
+*.pydevproject
+.metadata
+*.swp
+*~.nib
+.settings/
+.loadpath
+.externalToolBuilders/
+*.launch
+.cproject
+.classpath
+.factorypath
+.buildpath
+.target
+.texlipse
 
-# OS-specific files
-.DS_Store
-.DS_Store?
-._*
-.Trashes
-ehthumbs.db
-Thumbs.db
+############
+### Java ###
+*.class
+.mtj.tmp/
+*.jar
+*.war
+*.ear
+hs_err_pid*
 
+###############
+### Android ###
 # Built application files
 *.apk
 *.ap_
@@ -50,14 +85,16 @@ Thumbs.db
 # Files for the Dalvik VM
 *.dex
 
-# Java class files
-*.class
-
 # Generated files
 bin/
 gen/
 
+# Local configuration file (sdk path, etc)
 local.properties
+
+# Proguard
 proguard/
-*.log
+
+# Android Studio Stuff
 .navigation/
+gen-external-apklibs

app/build.gradle

@@ -11,6 +11,7 @@ android {
         targetSdkVersion 24
         versionCode 8
         versionName "0.1.6-next"
+        setProperty("archivesBaseName", "diasporaAndroid__${versionName}__")
 
         vectorDrawables.useSupportLibrary=true
     }
@@ -24,13 +25,6 @@ android {
     lintOptions {
         disable 'MissingTranslation'
     }
-
-    applicationVariants.all { variant ->
-        variant.outputs.each { output ->
-            output.outputFile = new File(
-                    output.outputFile.parent, "diasporaAndroid__${variant.versionName}__.apk")
-        }
-    }
 }
 
 repositories {