From 40d6788abfa46ac99f46b32fd4aeb78e67c3b6f6 Mon Sep 17 00:00:00 2001 From: Allan Wang Date: Sun, 9 Jul 2017 00:24:40 -0700 Subject: Clean up gradle and test build --- build.gradle | 77 ++++++++++++++++++++++++++++++++++++++++++++++++++---------- 1 file changed, 64 insertions(+), 13 deletions(-) (limited to 'build.gradle') diff --git a/build.gradle b/build.gradle index 76797e2..960f7e6 100644 --- a/build.gradle +++ b/build.gradle @@ -1,32 +1,83 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. buildscript { - ext.kotlin_version = '1.1.3' 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_version" + classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:${KOTLIN}" classpath 'com.github.dcendents:android-maven-gradle-plugin:1.5' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files } } -allprojects { - repositories { - jcenter() - mavenCentral() - maven { url "https://jitpack.io" } - maven { url "https://maven.google.com" } - } -} +//plugins { +// id 'com.gladed.androidgitversion' version '0.3.4' apply false +//} -task clean(type: Delete) { - delete rootProject.buildDir -} +//configure(subprojects - project(':sample')) { +//// apply plugin: 'com.gladed.androidgitversion' +//// apply from: '../extra.gradle' +// apply plugin: 'com.android.library' +// apply plugin: 'kotlin-android' +// apply plugin: 'com.github.dcendents.android-maven' +// +//// if (!it.plugins.hasPlugin('com.gladed.androidgitversion')) apply plugin: 'com.gladed.androidgitversion' +//// else dependencies { +//// compile project(':core') +//// } +// +// group = project.APP_GROUP +// +// repositories { +// jcenter() +// mavenCentral() +// maven { url "https://jitpack.io" } +// maven { url "https://maven.google.com" } +// } +// +// android { +// compileSdkVersion Integer.parseInt(project.TARGET_SDK) +// buildToolsVersion project.BUILD_TOOLS +// +//// androidGitVersion { +//// codeFormat = 'MMNNPPBB' +//// prefix 'v' +//// } +// +// defaultConfig { +// minSdkVersion Integer.parseInt(project.MIN_SDK) +// targetSdkVersion Integer.parseInt(project.TARGET_SDK) +//// versionCode androidGitVersion.code() +//// versionName androidGitVersion.name() +// consumerProguardFiles 'progress-proguard.txt' +// testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" +// } +// buildTypes { +// release { +// minifyEnabled false +// proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' +// } +// } +// lintOptions { +// abortOnError false +// checkReleaseBuilds false +// } +// resourcePrefix "kau_color" +// sourceSets { +// main.java.srcDirs += 'src/main/kotlin' +// test.java.srcDirs += 'src/test/kotlin' +// } +// } +//} + +//task clean(type: Delete) { +// delete rootProject.buildDir +//} task generateChangelogMd() { def parsedProjectXml = (new XmlParser()).parse("$project.rootDir/sample/src/main/res/xml/changelog.xml") -- cgit v1.2.3