Merge pull request #154 from ultrasonic/fix-fdroid

Fix F-Droid

build.gradle

@@ -13,7 +13,6 @@ buildscript {
         classpath gradlePlugins.ktlintGradle
         classpath gradlePlugins.detekt
         classpath gradlePlugins.jacocoAndroid
-        classpath gradlePlugins.buildVersioning
     }
 }
 

dependencies.gradle

@@ -1,4 +1,7 @@
 ext.versions = [
+        versionCode          : 62,
+        versionName          : "2.2.1",
+
         minSdk               : 14,
         targetSdk            : 22,
         compileSdk           : 27,
@@ -10,7 +13,6 @@ ext.versions = [
         detekt               : "1.0.0.RC6",
         jacoco               : "0.7.9",
         jacocoAndroid        : "0.1.2",
-        buildVersioning      : "1.6.0",
 
         androidSupport       : "22.2.1",
 
@@ -28,12 +30,11 @@ ext.versions = [
 ]
 
 ext.gradlePlugins = [
-        androidTools    : "com.android.tools.build:gradle:$versions.androidTools",
-        kotlin          : "org.jetbrains.kotlin:kotlin-gradle-plugin:$versions.kotlin",
-        ktlintGradle    : "gradle.plugin.org.jlleitschuh.gradle:ktlint-gradle:$versions.ktlintGradle",
-        detekt          : "gradle.plugin.io.gitlab.arturbosch.detekt:detekt-gradle-plugin:$versions.detekt",
-        jacocoAndroid   : "com.dicedmelon.gradle:jacoco-android:$versions.jacocoAndroid",
-        buildVersioning : "org.moallemi.gradle.advanced-build-version:gradle-plugin:$versions.buildVersioning",
+        androidTools  : "com.android.tools.build:gradle:$versions.androidTools",
+        kotlin        : "org.jetbrains.kotlin:kotlin-gradle-plugin:$versions.kotlin",
+        ktlintGradle  : "gradle.plugin.org.jlleitschuh.gradle:ktlint-gradle:$versions.ktlintGradle",
+        detekt        : "gradle.plugin.io.gitlab.arturbosch.detekt:detekt-gradle-plugin:$versions.detekt",
+        jacocoAndroid : "com.dicedmelon.gradle:jacoco-android:$versions.jacocoAndroid"
 ]
 
 ext.androidSupport = [

ultrasonic/build.gradle

@@ -1,30 +1,15 @@
 apply plugin: 'com.android.application'
 apply plugin: 'kotlin-android'
 apply plugin: 'jacoco-android'
-apply plugin: 'org.moallemi.advanced-build-version'
 apply from: "../gradle_scripts/code_quality.gradle"
 
-advancedVersioning {
-    nameOptions {
-        versionMajor 2
-        versionMinor 2
-        versionPatch 1
-    }
-    codeOptions {
-        versionCodeType org.moallemi.gradle.internal.VersionCodeType.AUTO_INCREMENT_ONE_STEP
-    }
-    outputOptions {
-        renameOutput true
-    }
-}
-
 android {
     compileSdkVersion versions.compileSdk
 
     defaultConfig {
         applicationId "org.moire.ultrasonic"
-        versionCode advancedVersioning.versionCode
-        versionName advancedVersioning.versionName
+        versionCode versions.versionCode
+        versionName versions.versionName
 
         minSdkVersion versions.minSdk
         targetSdkVersion versions.targetSdk

ultrasonic/src/main/AndroidManifest.xml

@@ -202,4 +202,4 @@
         </receiver>
     </application>
 
-</manifest>
+</manifest>

ultrasonic/version.properties

@@ -1,2 +0,0 @@
-#Tue Jan 23 22:14:32 CET 2018
-AI_VERSION_CODE=62