Skip to content

Commit

Permalink
See issue #4: Updated to latest Gradle/Kotlin
Browse files Browse the repository at this point in the history
  • Loading branch information
sureshjoshi committed Sep 4, 2020
1 parent c537545 commit a160bf7
Show file tree
Hide file tree
Showing 8 changed files with 193 additions and 44 deletions.
152 changes: 127 additions & 25 deletions .idea/codeStyles/Project.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

45 changes: 45 additions & 0 deletions .idea/jarRepositories.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 3 additions & 0 deletions .idea/modules.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
// Top-level build file where you can add configuration options common to all sub-projects/modules.

buildscript {
ext.kotlin_version = '1.3.21'
ext.android_tools = '3.3.1'
ext.kotlin_version = '1.4.0'
ext.android_tools = '4.0.1'

repositories {
google()
Expand Down
14 changes: 7 additions & 7 deletions dispatcher-sample/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -9,28 +9,28 @@ def versionMinor = 2
def versionPatch = 0

android {
compileSdkVersion 28
compileSdkVersion 30

defaultConfig {
applicationId "com.robotpajamas.android.dispatcher"
minSdkVersion 21
targetSdkVersion 28
targetSdkVersion 30
versionCode versionMajor * 10000 + versionMinor * 100 + versionPatch
versionName "${versionMajor}.${versionMinor}.${versionPatch}"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
}

buildFeatures {
dataBinding true
}

buildTypes {
release {
minifyEnabled false
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
}
}

dataBinding {
enabled = true
}

sourceSets {
main.java.srcDirs += 'src/main/kotlin'
test.java.srcDirs += 'src/test/kotlin'
Expand All @@ -40,7 +40,7 @@ android {
dependencies {
implementation fileTree(dir: 'libs', include: ['*.jar'])
implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
implementation 'androidx.appcompat:appcompat:1.1.0-alpha02'
implementation 'androidx.appcompat:appcompat:1.3.0-alpha02'
implementation 'com.jakewharton.timber:timber:4.7.1'
implementation project(path: ':dispatcher')
}
10 changes: 5 additions & 5 deletions dispatcher/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,10 @@ ext {
}

android {
compileSdkVersion 28
compileSdkVersion 30
defaultConfig {
minSdkVersion 21
targetSdkVersion 28
targetSdkVersion 30
versionCode versionMajor * 10000 + versionMinor * 100 + versionPatch
versionName "${versionMajor}.${versionMinor}.${versionPatch}"
}
Expand Down Expand Up @@ -70,11 +70,11 @@ dependencies {
testImplementation "org.junit.jupiter:junit-jupiter-api:5.3.1"
testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:5.3.1"

testImplementation "junit:junit:4.12"
testImplementation "junit:junit:4.13"
testRuntimeOnly "org.junit.vintage:junit-vintage-engine:5.4.0"

testImplementation 'org.assertj:assertj-core:3.12.1'
testImplementation 'com.nhaarman.mockitokotlin2:mockito-kotlin:2.1.0'
testImplementation 'org.assertj:assertj-core:3.13.2'
testImplementation 'com.nhaarman.mockitokotlin2:mockito-kotlin:2.2.0'
testImplementation "org.robolectric:robolectric:4.2"
}

Expand Down
5 changes: 2 additions & 3 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,11 @@
# 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.
android.enableJetifier=true
android.useAndroidX=true
org.gradle.jvmargs=-Xmx1536m

android.enableUnitTestBinaryResources=true
# 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
android.useAndroidX=true
android.enableJetifier=true
4 changes: 2 additions & 2 deletions gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#Mon Mar 04 13:05:26 EST 2019
#Fri Sep 04 00:40:09 EDT 2020
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.1-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip

0 comments on commit a160bf7

Please sign in to comment.