From 60b03749529138138fc8064920f22a8fd4748de0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=93scar=20Garc=C3=ADa=20Amor?= <ogarcia@connectical.com>
Date: Mon, 29 Jan 2018 16:26:08 +0100
Subject: [PATCH] Revert "Add versioning plugin."
This reverts commit c84482729d216d2b2f1c104f7b89de68806e17e5.
---
build.gradle | 1 -
dependencies.gradle | 12 +++++-------
ultrasonic/build.gradle | 18 ------------------
ultrasonic/src/main/AndroidManifest.xml | 4 +++-
ultrasonic/version.properties | 2 --
5 files changed, 8 insertions(+), 29 deletions(-)
delete mode 100644 ultrasonic/version.properties
diff --git a/build.gradle b/build.gradle
index 97610b36..25ea3d17 100644
--- a/build.gradle
+++ b/build.gradle
@@ -13,7 +13,6 @@ buildscript {
classpath gradlePlugins.ktlintGradle
classpath gradlePlugins.detekt
classpath gradlePlugins.jacocoAndroid
- classpath gradlePlugins.buildVersioning
}
}
diff --git a/dependencies.gradle b/dependencies.gradle
index 6c932026..75bf59c6 100644
--- a/dependencies.gradle
+++ b/dependencies.gradle
@@ -10,7 +10,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 +27,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 = [
diff --git a/ultrasonic/build.gradle b/ultrasonic/build.gradle
index 01a2d3c8..822c2243 100644
--- a/ultrasonic/build.gradle
+++ b/ultrasonic/build.gradle
@@ -1,31 +1,13 @@
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
-
minSdkVersion versions.minSdk
targetSdkVersion versions.targetSdk
diff --git a/ultrasonic/src/main/AndroidManifest.xml b/ultrasonic/src/main/AndroidManifest.xml
index 3d7bad42..d24a6d8d 100644
--- a/ultrasonic/src/main/AndroidManifest.xml
+++ b/ultrasonic/src/main/AndroidManifest.xml
@@ -1,7 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:a="http://schemas.android.com/apk/res/android"
package="org.moire.ultrasonic"
- a:installLocation="auto">
+ a:installLocation="auto"
+ a:versionCode="59"
+ a:versionName="2.0.0">
<uses-permission a:name="android.permission.INTERNET"/>
<uses-permission a:name="android.permission.ACCESS_NETWORK_STATE"/>
diff --git a/ultrasonic/version.properties b/ultrasonic/version.properties
deleted file mode 100644
index 9ebbcbd4..00000000
--- a/ultrasonic/version.properties
+++ /dev/null
@@ -1,2 +0,0 @@
-#Tue Jan 23 22:14:32 CET 2018
-AI_VERSION_CODE=62