Skip to content
Permalink
Browse files

refactoring project's build.gradle to kotlin dsl

  • Loading branch information...
nrohmen committed Mar 2, 2019
1 parent b708e61 commit 111bb73c35ec0a863f338c979772aea6bb8825a1
Showing with 14 additions and 7 deletions.
  1. +6 −0 .idea/codeStyles/Project.xml
  2. +1 −1 .idea/misc.xml
  3. +1 −1 app/build.gradle
  4. +6 −5 build.gradle → build.gradle.kts
@@ -1,5 +1,8 @@
<component name="ProjectCodeStyleConfiguration">
<code_scheme name="Project" version="173">
<JetCodeStyleSettings>
<option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" />
</JetCodeStyleSettings>
<Objective-C-extensions>
<file>
<option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Import" />
@@ -25,5 +28,8 @@
<pair source="c" header="h" fileNamingConvention="NONE" />
</extensions>
</Objective-C-extensions>
<codeStyleSettings language="kotlin">
<option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" />
</codeStyleSettings>
</code_scheme>
</component>
@@ -5,7 +5,7 @@
<configuration PROFILE_NAME="Debug" CONFIG_NAME="Debug" />
</configurations>
</component>
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_7">
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" project-jdk-name="1.8" project-jdk-type="JavaSDK">
<output url="file://$PROJECT_DIR$/build/classes" />
</component>
<component name="ProjectType">
@@ -24,7 +24,7 @@ android {

dependencies {
implementation fileTree(dir: 'libs', include: ['*.jar'])
implementation"org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
implementation"org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.3.21"
implementation 'com.android.support:appcompat-v7:28.0.0'
implementation 'com.android.support.constraint:constraint-layout:1.1.3'
testImplementation 'junit:junit:4.12'
@@ -1,15 +1,14 @@
// Top-level build file where you can add configuration options common to all sub-projects/modules.

buildscript {
ext.kotlin_version = '1.3.21'
repositories {
google()
jcenter()

}
dependencies {
classpath 'com.android.tools.build:gradle:3.3.1'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
classpath("com.android.tools.build:gradle:3.3.1")
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.21")
// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
}
@@ -23,6 +22,8 @@ allprojects {
}
}

task clean(type: Delete) {
delete rootProject.buildDir
tasks {
val clean by registering(Delete::class) {
delete(buildDir)
}
}

0 comments on commit 111bb73

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