finish project setup

This commit is contained in:
Felix 2018-09-08 18:54:21 +02:00
parent a3212fcc3f
commit a6f4898dbf
5 changed files with 12 additions and 25 deletions

View file

@ -1,7 +1,7 @@
// Top-level build file where you can add configuration options common to all sub-projects/modules.
buildscript {
ext.kotlin_version = '1.2.30'
ext.kotlin_version = '1.2.61'
repositories {
jcenter()
mavenCentral()
@ -11,7 +11,6 @@ buildscript {
classpath 'com.android.tools.build:gradle:3.1.4'
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
}
@ -20,29 +19,23 @@ buildscript {
allprojects {
repositories {
mavenLocal()
google()
jcenter()
maven { url "https://oss.sonatype.org/content/repositories/snapshots/" }
google()
maven { url 'https://jitpack.io' }
}
}
ext{
compileSdkVersion = 27
buildToolsVersion = "27.0.3"
minSDK = 22
targetSDK = 28
compileSdkVersion = 28
buildToolsVersion = "28.0.0"
supportLibraryVersion = "27.1.1"
constraintLayoutVersion = "1.0.2"
archCompVersion = "1.1.1"
minSDK = 22
targetSDK = 27
}
task clean(type: Delete) {
delete rootProject.buildDir
}
configurations.all {
resolutionStrategy {
cacheChangingModulesFor 0, 'seconds'
}
}

View file

@ -1,5 +1,4 @@
apply plugin: 'com.android.library'
apply plugin: 'android-maven'
apply plugin: 'kotlin-android'
apply plugin: 'kotlin-kapt'
@ -12,7 +11,7 @@ android {
minSdkVersion rootProject.ext.minSDK
targetSdkVersion rootProject.ext.targetSDK
versionCode 1
versionName rootProject.ext.version
versionName '2.0.0'
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
@ -32,7 +31,6 @@ android {
}
group="de.nicidienase.chaosflix"
version=rootProject.ext.version
dependencies {
api "com.android.support:appcompat-v7:${rootProject.ext.supportLibraryVersion}"

0
gradlew vendored Normal file → Executable file
View file

View file

@ -1 +1 @@
include ':touch'
include ':touch', ':common'

View file

@ -11,8 +11,8 @@ android {
minSdkVersion rootProject.ext.minSDK
targetSdkVersion rootProject.ext.targetSDK
// odd for touch, even for leanback
versionCode 25
versionName "0.2.9"
versionCode 26
versionName "0.3.0"
multiDexEnabled true
}
buildTypes {
@ -53,8 +53,7 @@ android {
dependencies {
// implementation 'com.github.NiciDieNase:chaosflix-common:2.0.0-SNAPSHOT'
implementation 'de.nicidienase.chaosflix:common:2.0.0-SNAPSHOT'
implementation project(':common')
implementation('com.mikepenz:aboutlibraries:6.1.1@aar') {
transitive = true
@ -69,13 +68,10 @@ dependencies {
implementation "com.android.support:design:${rootProject.ext.supportLibraryVersion}"
implementation "com.android.support:preference-v14:${rootProject.ext.supportLibraryVersion}"
// implementation "android.arch.lifecycle:runtime:1.0.3"
implementation "android.arch.lifecycle:extensions:${rootProject.ext.archCompVersion}"
implementation "android.arch.lifecycle:common-java8:1.1.1"
implementation "android.arch.persistence.room:runtime:${rootProject.ext.archCompVersion}"
// kapt 'com.android.databinding:compiler:3.2.0-alpha10'
kapt "android.arch.lifecycle:compiler:${rootProject.ext.archCompVersion}"
// kapt "android.arch.persistence.room:compiler:${rootProject.ext.archCompVersion}"
implementation "org.jetbrains.kotlin:kotlin-reflect:1.2.61"
implementation 'com.squareup.retrofit2:retrofit:2.3.0'
@ -105,7 +101,7 @@ dependencies {
exclude group: 'com.android.support', module: 'support-annotations'
}
implementation 'commons-io:commons-io:2.4'
implementation "org.jetbrains.kotlin:kotlin-stdlib-jre7:$kotlin_version"
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
}
repositories {
mavenCentral()