Skip to content

Commit

Permalink
rebase tagViewGroup by kotlin
Browse files Browse the repository at this point in the history
  • Loading branch information
shellljx committed May 12, 2018
1 parent 01b368f commit bcec91f
Show file tree
Hide file tree
Showing 22 changed files with 1,076 additions and 1,079 deletions.
2 changes: 2 additions & 0 deletions build.gradle
@@ -1,12 +1,14 @@
// Top-level build file where you can add configuration options common to all sub-projects/modules.

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

// NOTE: Do not place your application dependence.gradle here; they belong
// in the individual module build.gradle files
Expand Down
17 changes: 8 additions & 9 deletions gradle.properties
@@ -1,17 +1,16 @@
# Project-wide Gradle settings.

# IDE (e.g. Android Studio) users:
# Gradle settings configured through the IDE *will override*
# any settings specified in this file.

## Project-wide Gradle settings.
#
# For more details on how to configure your build environment visit
# http://www.gradle.org/docs/current/userguide/build_environment.html

#
# Specifies the JVM arguments used for the daemon process.
# The setting is particularly useful for tweaking memory settings.
org.gradle.jvmargs=-Xmx1536m

# Default value: -Xmx1024m -XX:MaxPermSize=256m
# org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
#
# When configured, Gradle will run in incubating parallel mode.
# This option should only be used with decoupled projects. More details, visit
# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
# org.gradle.parallel=true
#Sun Apr 22 13:39:24 CST 2018
org.gradle.jvmargs=-Xmx1536m
11 changes: 11 additions & 0 deletions library/build.gradle
@@ -1,4 +1,5 @@
apply plugin: 'com.android.library'
apply plugin: 'kotlin-android'
apply from: new File('../dependence.gradle')

android {
Expand All @@ -20,6 +21,12 @@ android {
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
}
}
sourceSets {
main {
resources.srcDirs = ['src/main/resources', 'src/main/resources/']
java.srcDirs = ['src/main/java', 'src/main/kotlin']
}
}
}

dependencies {
Expand All @@ -29,4 +36,8 @@ dependencies {
})
api "com.android.support:appcompat-v7:${project.ext.supportLib}"
testCompile "junit:junit:${project.ext.junit}"
compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
}
repositories {
mavenCentral()
}
50 changes: 0 additions & 50 deletions library/src/main/java/com/licrafter/tagview/DIRECTION.java

This file was deleted.

63 changes: 0 additions & 63 deletions library/src/main/java/com/licrafter/tagview/TagAdapter.java

This file was deleted.

0 comments on commit bcec91f

Please sign in to comment.