aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAllan Wang <me@allanwang.ca>2017-07-02 17:27:18 -0700
committerAllan Wang <me@allanwang.ca>2017-07-02 17:27:18 -0700
commit4007e36b7fb0963fe51ea2ea2fe5aaa93ad9917c (patch)
treedcd4e5eccfe2ecba395f2f857e35c6a4b7e77ceb
parent4a07d2ed10741e08895c9e9f03738656ddfc33f9 (diff)
downloadfrost-4007e36b7fb0963fe51ea2ea2fe5aaa93ad9917c.tar.gz
frost-4007e36b7fb0963fe51ea2ea2fe5aaa93ad9917c.tar.bz2
frost-4007e36b7fb0963fe51ea2ea2fe5aaa93ad9917c.zip
Move git versioning
-rw-r--r--.idea/misc.xml2
-rw-r--r--app/build.gradle4
-rw-r--r--build.gradle2
3 files changed, 2 insertions, 6 deletions
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 7319f021..085136f8 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -53,7 +53,7 @@
<ConfirmationsSetting value="0" id="Add" />
<ConfirmationsSetting value="0" id="Remove" />
</component>
- <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" assert-keyword="true" jdk-15="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+ <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" default="true" assert-keyword="true" jdk-15="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
<output url="file://$PROJECT_DIR$/build/classes" />
</component>
<component name="ProjectType">
diff --git a/app/build.gradle b/app/build.gradle
index 6c4f05bf..99010de6 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -1,7 +1,5 @@
-import org.eclipse.jgit.api.Git
-import org.eclipse.jgit.storage.file.FileRepositoryBuilder
-
plugins {
+ id "com.zoltu.git-versioning" version "3.0.3"
id 'com.gladed.androidgitversion' version '0.3.4'
}
diff --git a/build.gradle b/build.gradle
index f0daea0d..ac155d03 100644
--- a/build.gradle
+++ b/build.gradle
@@ -4,14 +4,12 @@ buildscript {
repositories {
jcenter()
maven { url 'https://maven.fabric.io/public' }
- maven { url "https://plugins.gradle.org/m2/" }
}
dependencies {
classpath 'com.android.tools.build:gradle:2.3.3'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:${KOTLIN}"
classpath 'io.fabric.tools:gradle:1.+'
classpath 'com.github.triplet.gradle:play-publisher:1.2.0'
- classpath "gradle.plugin.com.zoltu.gradle.plugin:git-versioning:3.0.3"
//https://mvnrepository.com/artifact/org.eclipse.jgit/org.eclipse.jgit
// classpath 'org.eclipse.jgit:org.eclipse.jgit:4.8.0.201706111038-r'
}