Skip to content
Permalink
Browse files

Rewrite Gradle configuration with Kotlin DSL (#488)

Signed-off-by: Harsh Shandilya <msfjarvis@gmail.com>
  • Loading branch information...
msfjarvis authored and zeapo committed Mar 2, 2019
1 parent 0b6ba54 commit 3c06063153d0b7f71998128dc6fb4e5967e33624
Showing with 99 additions and 101 deletions.
  1. +0 −93 app/build.gradle
  2. +95 −0 app/build.gradle.kts
  3. +2 −6 build.gradle → build.gradle.kts
  4. +1 −1 gradle/wrapper/gradle-wrapper.properties
  5. +0 −1 settings.gradle
  6. +1 −0 settings.gradle.kts

This file was deleted.

@@ -0,0 +1,95 @@
import org.jetbrains.kotlin.config.KotlinCompilerVersion

plugins {
id("com.android.application")
id("kotlin-android")
id("kotlin-android-extensions")
id("eclipse")
}

val buildTypeRelease = "release"
android {
compileSdkVersion(28)

defaultConfig {
applicationId = "com.zeapo.pwdstore"
minSdkVersion(21)
targetSdkVersion(28)
versionCode = 10302
versionName = "1.3.2"
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
}

buildTypes {
getByName("debug") {
applicationIdSuffix = ".debug"
}
}

compileOptions {
setSourceCompatibility(JavaVersion.VERSION_1_8)
setTargetCompatibility(JavaVersion.VERSION_1_8)
}

lintOptions {
isAbortOnError = true // make sure build fails with lint errors!
disable("MissingTranslation", "PluralsCandidate")
}

packagingOptions {
exclude(".readme")
exclude("META-INF/LICENSE.txt")
exclude("META-INF/NOTICE.txt")
}

/*
* To sign release builds, create the file `gradle.properties` in
* $HOME/.gradle or in your project directory with this content:
*
* mStoreFile=/path/to/key.store
* mStorePassword=xxx
* mKeyAlias=alias
* mKeyPassword=xxx
*/
if (project.hasProperty("mStoreFile") &&
project.hasProperty("mStorePassword") &&
project.hasProperty("mKeyAlias") &&
project.hasProperty("mKeyPassword")) {
signingConfigs {
getByName(buildTypeRelease) {
storeFile = file(project.properties["mStoreFile"] as String)
storePassword = project.properties["mStorePassword"] as String
keyAlias = project.properties["mKeyAlias"] as String
keyPassword = project.properties["mKeyPassword"] as String
}
}
buildTypes.getByName(buildTypeRelease).signingConfig = signingConfigs.getByName(buildTypeRelease)
}
}

dependencies {
implementation("androidx.appcompat:appcompat:1.0.0")
implementation("androidx.recyclerview:recyclerview:1.0.0")
implementation("androidx.cardview:cardview:1.0.0")
implementation("com.google.android.material:material:1.0.0")
implementation("androidx.annotation:annotation:1.0.0")
implementation("org.sufficientlysecure:openpgp-api:11.0")
implementation("com.nononsenseapps:filepicker:2.4.2")
implementation("org.eclipse.jgit:org.eclipse.jgit:3.7.1.201504261725-r") {
exclude(group = "org.apache.httpcomponents", module = "httpclient")
}
implementation("com.jcraft:jsch:0.1.54")
implementation("commons-io:commons-io:2.5")
implementation("commons-codec:commons-codec:1.11")
implementation("com.jayway.android.robotium:robotium-solo:5.3.1")
implementation(kotlin("stdlib-jdk7", KotlinCompilerVersion.VERSION))
implementation("androidx.constraintlayout:constraintlayout:1.1.3")

// Testing-only dependencies
androidTestImplementation("junit:junit:4.12")
androidTestImplementation("org.mockito:mockito-core:2.18.0")
androidTestImplementation("androidx.test:runner:1.1.0-alpha4")
androidTestImplementation("androidx.test:rules:1.1.0-alpha4")
androidTestImplementation("androidx.test.espresso:espresso-core:3.1.0-alpha4")
androidTestImplementation("androidx.test.espresso:espresso-intents:3.1.0-alpha4")
}
@@ -1,18 +1,14 @@
// Top-level build file where you can add configuration options common to all sub-projects/modules.

buildscript {
ext.kotlin_version = '1.2.71'
repositories {
google()
jcenter()
mavenCentral()
}
dependencies {
classpath 'com.android.tools.build:gradle:3.2.1'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"

// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
classpath("com.android.tools.build:gradle:3.2.1")
classpath(kotlin("gradle-plugin", "1.2.71"))
}
}

@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.2-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-5.2.1-all.zip

This file was deleted.

@@ -0,0 +1 @@
include(":app")

0 comments on commit 3c06063

Please sign in to comment.
You can’t perform that action at this time.