diff --git a/app/build.gradle b/app/build.gradle index ccee207..db9d40b 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -1,36 +1,36 @@ apply plugin: 'com.android.application' android { - compileSdkVersion 26 - defaultConfig { - applicationId "com.ryanwarsaw.coach_erevu" - minSdkVersion 19 - targetSdkVersion 26 - versionCode 1 - versionName "1.0" - testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" - } - buildTypes { - release { - minifyEnabled false - proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' - } + compileSdkVersion 28 + defaultConfig { + applicationId "com.ryanwarsaw.coach_erevu" + minSdkVersion 19 + targetSdkVersion 28 + versionCode 2 + versionName "2.1" + testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" + } + buildTypes { + release { + minifyEnabled false + proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' } + } } dependencies { - implementation fileTree(dir: 'libs', include: ['*.jar']) - implementation 'com.android.support:support-v4:26.1.0' - implementation 'com.android.support:appcompat-v7:26.1.0' - implementation 'com.android.support.constraint:constraint-layout:1.1.3' - implementation 'com.google.code.gson:gson:2.8.2' - implementation 'com.google.android.exoplayer:exoplayer-core:2.7.3' - implementation 'com.google.android.exoplayer:exoplayer-ui:2.7.3' + compileOnly 'org.projectlombok:lombok:1.18.2' + annotationProcessor 'org.projectlombok:lombok:1.18.2' - compileOnly 'org.projectlombok:lombok:1.16.20' - annotationProcessor 'org.projectlombok:lombok:1.16.20' + implementation fileTree(dir: 'libs', include: ['*.jar']) + implementation 'com.android.support:support-v4:28.0.0-rc02' + implementation 'com.android.support:appcompat-v7:28.0.0-rc02' + implementation 'com.android.support.constraint:constraint-layout:1.1.3' + implementation 'com.google.code.gson:gson:2.8.2' + implementation 'com.google.android.exoplayer:exoplayer-core:2.7.3' + implementation 'com.google.android.exoplayer:exoplayer-ui:2.7.3' - testImplementation 'junit:junit:4.12' - androidTestImplementation 'com.android.support.test:runner:1.0.2' - androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2' + testImplementation 'junit:junit:4.12' + androidTestImplementation 'com.android.support.test:runner:1.0.2' + androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2' } diff --git a/build.gradle b/build.gradle index 43c0708..dc516e4 100644 --- a/build.gradle +++ b/build.gradle @@ -1,27 +1,28 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. buildscript { - - repositories { - google() - jcenter() - } - dependencies { - classpath 'com.android.tools.build:gradle:3.1.3' - - - // NOTE: Do not place your application dependencies here; they belong - // in the individual module build.gradle files + repositories { + google() + jcenter() + maven { + url "https://plugins.gradle.org/m2" } + } + dependencies { + classpath 'com.android.tools.build:gradle:3.1.4' + classpath "io.franzbecker:gradle-lombok:1.14" + } } allprojects { - repositories { - google() - jcenter() - } + repositories { + google() + jcenter() + } } task clean(type: Delete) { - delete rootProject.buildDir + delete rootProject.buildDir } + +apply plugin: "io.franzbecker.gradle-lombok" \ No newline at end of file