-
Notifications
You must be signed in to change notification settings - Fork 12
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
use kotlin extensions and common Gradle in dependency managemnt
- Loading branch information
1 parent
9f27501
commit 4cdba90
Showing
39 changed files
with
45 additions
and
125 deletions.
There are no files selected for viewing
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file modified
BIN
+0 Bytes
(100%)
buildSrc/build/kotlin/compileKotlin/caches-jvm/inputs/source-to-output.tab
Binary file not shown.
Binary file modified
BIN
+3.26 KB
(230%)
buildSrc/build/kotlin/compileKotlin/caches-jvm/inputs/source-to-output.tab.values.at
Binary file not shown.
Binary file modified
BIN
+0 Bytes
(100%)
buildSrc/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab
Binary file not shown.
Binary file modified
BIN
+1.98 KB
(250%)
...rc/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab.values.at
Binary file not shown.
Binary file modified
BIN
+0 Bytes
(100%)
buildSrc/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/constants.tab
Binary file not shown.
Binary file modified
BIN
+20.2 KB
(360%)
buildSrc/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/constants.tab.values.at
Binary file not shown.
Binary file modified
BIN
+0 Bytes
(100%)
buildSrc/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/internal-name-to-source.tab
Binary file not shown.
Binary file modified
BIN
+1.98 KB
(250%)
...rc/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/internal-name-to-source.tab.values.at
Binary file not shown.
Binary file modified
BIN
+0 Bytes
(100%)
buildSrc/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/proto.tab
Binary file not shown.
Binary file modified
BIN
+10.1 KB
(320%)
buildSrc/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/proto.tab.values.at
Binary file not shown.
Binary file modified
BIN
+0 Bytes
(100%)
buildSrc/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/source-to-classes.tab
Binary file not shown.
Binary file modified
BIN
+305 Bytes
(200%)
buildSrc/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/source-to-classes.tab.values.at
Binary file not shown.
4 changes: 2 additions & 2 deletions
4
buildSrc/build/kotlin/compileKotlin/caches-jvm/lookups/counters.tab
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,2 +1,2 @@ | ||
8 | ||
3 | ||
16 | ||
11 |
Binary file modified
BIN
+0 Bytes
(100%)
buildSrc/build/kotlin/compileKotlin/caches-jvm/lookups/file-to-id.tab
Binary file not shown.
Binary file modified
BIN
+48 Bytes
(150%)
buildSrc/build/kotlin/compileKotlin/caches-jvm/lookups/file-to-id.tab.values.at
Binary file not shown.
Binary file modified
BIN
+0 Bytes
(100%)
buildSrc/build/kotlin/compileKotlin/caches-jvm/lookups/id-to-file.tab
Binary file not shown.
Binary file modified
BIN
+0 Bytes
(100%)
buildSrc/build/kotlin/compileKotlin/caches-jvm/lookups/id-to-file.tab.keystream
Binary file not shown.
Binary file modified
BIN
+0 Bytes
(100%)
buildSrc/build/kotlin/compileKotlin/caches-jvm/lookups/id-to-file.tab.keystream.len
Binary file not shown.
Binary file modified
BIN
+0 Bytes
(100%)
buildSrc/build/kotlin/compileKotlin/caches-jvm/lookups/id-to-file.tab.len
Binary file not shown.
Binary file modified
BIN
+739 Bytes
(190%)
buildSrc/build/kotlin/compileKotlin/caches-jvm/lookups/id-to-file.tab.values.at
Binary file not shown.
Binary file modified
BIN
+0 Bytes
(100%)
buildSrc/build/kotlin/compileKotlin/caches-jvm/lookups/id-to-file.tab_i
Binary file not shown.
Binary file modified
BIN
+0 Bytes
(100%)
buildSrc/build/kotlin/compileKotlin/caches-jvm/lookups/lookups.tab
Binary file not shown.
Binary file modified
BIN
+0 Bytes
(100%)
buildSrc/build/kotlin/compileKotlin/caches-jvm/lookups/lookups.tab.keystream
Binary file not shown.
Binary file modified
BIN
+0 Bytes
(100%)
buildSrc/build/kotlin/compileKotlin/caches-jvm/lookups/lookups.tab.keystream.len
Binary file not shown.
Binary file modified
BIN
+0 Bytes
(100%)
buildSrc/build/kotlin/compileKotlin/caches-jvm/lookups/lookups.tab.len
Binary file not shown.
Binary file modified
BIN
+6.49 KB
(620%)
buildSrc/build/kotlin/compileKotlin/caches-jvm/lookups/lookups.tab.values.at
Binary file not shown.
Binary file modified
BIN
+0 Bytes
(100%)
buildSrc/build/kotlin/compileKotlin/caches-jvm/lookups/lookups.tab_i
Binary file not shown.
Binary file not shown.
Binary file not shown.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,54 +1,17 @@ | ||
apply plugin: 'com.android.library' | ||
apply plugin: 'kotlin-android-extensions' | ||
apply plugin: 'kotlin-android' | ||
apply plugin: 'com.github.dcendents.android-maven' | ||
|
||
android { | ||
compileSdkVersion 29 | ||
|
||
defaultConfig { | ||
minSdkVersion 14 | ||
targetSdkVersion 29 | ||
versionCode 1 | ||
versionName "0.5.0" | ||
} | ||
buildTypes { | ||
release { | ||
minifyEnabled false | ||
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' | ||
} | ||
} | ||
android { | ||
lintOptions { | ||
abortOnError false | ||
} | ||
|
||
testOptions { | ||
unitTests.includeAndroidResources = true | ||
} | ||
} | ||
|
||
compileOptions { | ||
sourceCompatibility JavaVersion.VERSION_1_8 | ||
targetCompatibility JavaVersion.VERSION_1_8 | ||
} | ||
} | ||
|
||
apply plugin: Plugins.androidLibrary | ||
apply from: "$rootDir/${GradleName.common}" | ||
apply plugin: "${Plugins.kotlinAndroid}" | ||
apply plugin: "${Plugins.kotlinAndroidExtensions}" | ||
apply plugin: "${Plugins.dcendents}" | ||
|
||
dependencies { | ||
implementation fileTree(dir: 'libs', include: ['*.jar']) | ||
implementation 'androidx.appcompat:appcompat:1.1.0' | ||
implementation 'com.google.android.material:material:1.2.0-alpha02' | ||
api "io.reactivex.rxjava2:rxjava:2.2.15" | ||
implementation "androidx.core:core-ktx:+" | ||
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" | ||
|
||
implementation TestDeps.test_junit | ||
implementation TestDeps.mockito_kotlin | ||
implementation TestDeps.androidx_junit | ||
implementation TestDeps.androidx_test_core_ktx | ||
|
||
} | ||
repositories { | ||
mavenCentral() | ||
api Deps.rxJava | ||
implementation Deps.androidx_appCompat | ||
implementation Deps.android_material | ||
implementation Deps.androidx_core_ktx | ||
|
||
testImplementation TestDeps.junit | ||
testImplementation TestDeps.androidx_junit | ||
testImplementation TestDeps.androidx_espressoCore | ||
testImplementation TestDeps.androidx_test_core_ktx | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,62 +1,13 @@ | ||
apply plugin: 'com.android.application' | ||
apply plugin: 'kotlin-android-extensions' | ||
apply plugin: 'kotlin-android' | ||
|
||
android { | ||
compileSdkVersion 29 | ||
|
||
defaultConfig { | ||
applicationId "com.sha.formvalidatorsample" | ||
minSdkVersion 15 | ||
targetSdkVersion 29 | ||
versionCode 1 | ||
versionName "1.0" | ||
|
||
renderscriptTargetApi 25 | ||
renderscriptSupportModeEnabled true | ||
multiDexEnabled true | ||
} | ||
buildTypes { | ||
release { | ||
minifyEnabled false | ||
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' | ||
} | ||
} | ||
android { | ||
lintOptions { | ||
abortOnError false | ||
} | ||
} | ||
|
||
compileOptions { | ||
sourceCompatibility JavaVersion.VERSION_1_8 | ||
targetCompatibility JavaVersion.VERSION_1_8 | ||
} | ||
} | ||
|
||
ext { | ||
supportVersion = '25.1.1' | ||
frescoVersion = '1.2.0' | ||
} | ||
apply plugin: Plugins.androidApplication | ||
apply from: "$rootDir/${GradleName.common}" | ||
apply plugin: "${Plugins.kotlinAndroid}" | ||
apply plugin: "${Plugins.kotlinAndroidExtensions}" | ||
|
||
dependencies { | ||
implementation project(':lib') | ||
implementation 'com.google.android.material:material:1.0.0' | ||
implementation 'androidx.appcompat:appcompat:1.0.0' | ||
implementation 'androidx.legacy:legacy-support-v4:1.0.0' | ||
implementation 'androidx.cardview:cardview:1.0.0' | ||
|
||
implementation 'com.github.mmin18:realtimeblurview:1.1.0' | ||
implementation 'me.relex:circleindicator:1.2.2@aar' | ||
|
||
implementation 'com.squareup.picasso:picasso:2.71828' | ||
implementation 'jp.co.cyberagent.android.gpuimage:gpuimage-library:1.3.0' | ||
|
||
implementation 'com.annimon:stream:1.2.1' | ||
implementation 'androidx.multidex:multidex:2.0.1' | ||
compile "androidx.core:core-ktx:+" | ||
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" | ||
} | ||
repositories { | ||
mavenCentral() | ||
} | ||
implementation Deps.androidx_appCompat | ||
implementation Deps.android_material | ||
implementation Deps.androidx_core_ktx | ||
implementation Deps.multidex | ||
} |