Skip to content

Commit 84a15a5

Browse files
authored
Merge pull request #18 from jitpack/migtate-to-kotlin
Migtate to kotlin
2 parents 8f08b20 + 806c1ec commit 84a15a5

File tree

20 files changed

+180
-216
lines changed

20 files changed

+180
-216
lines changed

.gitignore

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
1-
.gradle
2-
/local.properties
3-
/.idea/workspace.xml
4-
/.idea/libraries
5-
.DS_Store
6-
/build
1+
.idea/
2+
build/
3+
local.properties
74
*.iml
8-
/.idea
9-
5+
*.log
6+
.gradle/
7+
.DS_Store

build.gradle

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,22 @@
1-
// Top-level build file where you can add configuration options common to all sub-projects/modules.
2-
31
buildscript {
2+
ext.kotlin_version = '1.2.61'
43
repositories {
4+
google()
55
jcenter()
6+
mavenCentral()
67
}
78
dependencies {
8-
classpath 'com.android.tools.build:gradle:2.2.3'
9+
classpath 'com.android.tools.build:gradle:3.2.0-beta05'
10+
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
911
classpath 'com.github.dcendents:android-maven-gradle-plugin:1.5'
1012
}
1113
}
1214

1315
allprojects {
1416
repositories {
17+
mavenCentral()
18+
google()
1519
jcenter()
20+
maven { url "https://jitpack.io" }
1621
}
1722
}

gradle.properties

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +0,0 @@
1-
# Project-wide Gradle settings.
2-
3-
# IDE (e.g. Android Studio) users:
4-
# Gradle settings configured through the IDE *will override*
5-
# any settings specified in this file.
6-
7-
# For more details on how to configure your build environment visit
8-
# http://www.gradle.org/docs/current/userguide/build_environment.html
9-
10-
# Specifies the JVM arguments used for the daemon process.
11-
# The setting is particularly useful for tweaking memory settings.
12-
# Default value: -Xmx10248m -XX:MaxPermSize=256m
13-
# org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
14-
15-
# When configured, Gradle will run in incubating parallel mode.
16-
# This option should only be used with decoupled projects. More details, visit
17-
# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
18-
# org.gradle.parallel=true

gradle/wrapper/gradle-wrapper.jar

-3.57 KB
Binary file not shown.

gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
33
zipStoreBase=GRADLE_USER_HOME
44
zipStorePath=wrapper/dists
5-
distributionUrl=https\://services.gradle.org/distributions/gradle-3.4-all.zip
5+
distributionUrl=https\://services.gradle.org/distributions/gradle-4.9-all.zip

gradlew

Lines changed: 26 additions & 26 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

gradlew.bat

Lines changed: 90 additions & 90 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)