Skip to content

Commit

Permalink
Update dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
yaraki committed Aug 27, 2018
1 parent da57015 commit 7f8ac79
Show file tree
Hide file tree
Showing 8 changed files with 89 additions and 65 deletions.
8 changes: 8 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
*.iml
.gradle
/local.properties
.idea
.DS_Store
/build
/captures
.externalNativeBuild
27 changes: 13 additions & 14 deletions app-java/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,12 @@ apply plugin: 'com.android.application'

android {

compileSdkVersion 27
compileSdkVersion versions.compileSdk

defaultConfig {
applicationId 'com.example.android.cheeseroom'
minSdkVersion 14
targetSdkVersion 27
minSdkVersion versions.minSdk
targetSdkVersion versions.targetSdk
versionCode 1
versionName '1.0'
testInstrumentationRunner 'android.support.test.runner.AndroidJUnitRunner'
Expand Down Expand Up @@ -53,20 +53,19 @@ dependencies {
implementation project(':common')

// Support Libraries
implementation"com.android.support:appcompat-v7:$supportVersion"
implementation"com.android.support:design:$supportVersion"
implementation "com.android.support:recyclerview-v7:$supportVersion"
implementation 'com.android.support.constraint:constraint-layout:1.0.2'
implementation "com.android.support:appcompat-v7:$versions.support"
implementation "com.android.support:design:$versions.support"
implementation "com.android.support:recyclerview-v7:$versions.support"

// Architecture Components
implementation "android.arch.lifecycle:extensions:$lifecycleVersion"
implementation "android.arch.persistence.room:runtime:$roomVersion"
annotationProcessor "android.arch.persistence.room:compiler:$roomVersion"
implementation "android.arch.lifecycle:extensions:$versions.lifecycle"
implementation "android.arch.persistence.room:runtime:$versions.room"
annotationProcessor "android.arch.persistence.room:compiler:$versions.room"

// Tests
testImplementation 'junit:junit:4.12'
testImplementation 'org.mockito:mockito-core:2.13.0'
androidTestImplementation 'org.mockito:mockito-android:2.13.0'
androidTestImplementation 'com.android.support.test:runner:1.0.1'
androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.1'
testImplementation "org.mockito:mockito-core:$versions.mockito"
androidTestImplementation "org.mockito:mockito-android:$versions.mockito"
androidTestImplementation "com.android.support.test:runner:$versions.runner"
androidTestImplementation "com.android.support.test.espresso:espresso-core:$versions.espresso"
}
28 changes: 14 additions & 14 deletions app-kotlin/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,12 @@ apply plugin: 'kotlin-kapt'

android {

compileSdkVersion 27
compileSdkVersion versions.compileSdk

defaultConfig {
applicationId 'com.example.android.cheeseroom'
minSdkVersion 14
targetSdkVersion 27
minSdkVersion versions.minSdk
targetSdkVersion versions.targetSdk
versionCode 1
versionName '1.0'
testInstrumentationRunner 'android.support.test.runner.AndroidJUnitRunner'
Expand Down Expand Up @@ -55,22 +55,22 @@ dependencies {
implementation project(':common')

// Kotlin
compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlinVersion"
compile "org.jetbrains.kotlin:kotlin-stdlib:$versions.kotlin"

// Support Libraries
implementation"com.android.support:appcompat-v7:$supportVersion"
implementation"com.android.support:design:$supportVersion"
implementation "com.android.support:recyclerview-v7:$supportVersion"
implementation "com.android.support:appcompat-v7:$versions.support"
implementation "com.android.support:design:$versions.support"
implementation "com.android.support:recyclerview-v7:$versions.support"

// Architecture Components
implementation "android.arch.lifecycle:extensions:$lifecycleVersion"
implementation "android.arch.persistence.room:runtime:$roomVersion"
kapt "android.arch.persistence.room:compiler:$roomVersion"
implementation "android.arch.lifecycle:extensions:$versions.lifecycle"
implementation "android.arch.persistence.room:runtime:$versions.room"
kapt "android.arch.persistence.room:compiler:$versions.room"

// Tests
testImplementation 'junit:junit:4.12'
testImplementation 'org.mockito:mockito-core:2.13.0'
androidTestImplementation 'org.mockito:mockito-android:2.13.0'
androidTestImplementation 'com.android.support.test:runner:1.0.1'
androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.1'
testImplementation "org.mockito:mockito-core:$versions.mockito"
androidTestImplementation "org.mockito:mockito-android:$versions.mockito"
androidTestImplementation "com.android.support.test:runner:$versions.runner"
androidTestImplementation "com.android.support.test.espresso:espresso-core:$versions.espresso"
}
28 changes: 14 additions & 14 deletions app-start/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,12 @@ apply plugin: 'kotlin-kapt'

android {

compileSdkVersion 27
compileSdkVersion versions.compileSdk

defaultConfig {
applicationId 'com.example.android.cheeseroom'
minSdkVersion 14
targetSdkVersion 27
minSdkVersion versions.minSdk
targetSdkVersion versions.targetSdk
versionCode 1
versionName '1.0'
testInstrumentationRunner 'android.support.test.runner.AndroidJUnitRunner'
Expand Down Expand Up @@ -55,22 +55,22 @@ dependencies {
implementation project(':common')

// Kotlin
compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlinVersion"
compile "org.jetbrains.kotlin:kotlin-stdlib:$versions.kotlin"

// Support Libraries
implementation"com.android.support:appcompat-v7:$supportVersion"
implementation"com.android.support:design:$supportVersion"
implementation "com.android.support:recyclerview-v7:$supportVersion"
implementation "com.android.support:appcompat-v7:$versions.support"
implementation "com.android.support:design:$versions.support"
implementation "com.android.support:recyclerview-v7:$versions.support"

// Architecture Components
implementation "android.arch.lifecycle:extensions:$lifecycleVersion"
implementation "android.arch.persistence.room:runtime:$roomVersion"
kapt "android.arch.persistence.room:compiler:$roomVersion"
implementation "android.arch.lifecycle:extensions:$versions.lifecycle"
implementation "android.arch.persistence.room:runtime:$versions.room"
kapt "android.arch.persistence.room:compiler:$versions.room"

// Tests
testImplementation 'junit:junit:4.12'
testImplementation 'org.mockito:mockito-core:2.13.0'
androidTestImplementation 'org.mockito:mockito-android:2.13.0'
androidTestImplementation 'com.android.support.test:runner:1.0.1'
androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.1'
testImplementation "org.mockito:mockito-core:$versions.mockito"
androidTestImplementation "org.mockito:mockito-android:$versions.mockito"
androidTestImplementation "com.android.support.test:runner:$versions.runner"
androidTestImplementation "com.android.support.test.espresso:espresso-core:$versions.espresso"
}
22 changes: 14 additions & 8 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,19 +1,25 @@
// Top-level build file where you can add configuration options common to all sub-projects/modules.

buildscript {
ext {
kotlinVersion = '1.2.30'
supportVersion = '27.0.2'
lifecycleVersion = '1.1.0'
roomVersion = '1.0.0'
}
ext.versions = [
minSdk: 14,
targetSdk: 27,
compileSdk: 27,
kotlin: '1.2.61',
support: '27.1.1',
lifecycle: '1.1.1',
room: '1.1.1',
mockito: '2.19.0',
runner: '1.0.2',
espresso: '3.0.2',
]
repositories {
google()
jcenter()
}
dependencies {
classpath 'com.android.tools.build:gradle:3.0.1'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion"
classpath 'com.android.tools.build:gradle:3.1.4'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$versions.kotlin"
}
}

Expand Down
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 @@
#Wed Dec 06 18:06:23 JST 2017
#Mon Aug 27 12:47:40 JST 2018
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip
9 changes: 9 additions & 0 deletions local.properties
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
## This file must *NOT* be checked into Version Control Systems,
# as it contains information specific to your local configuration.
#
# Location of the SDK. This is only used by Gradle.
# For customization when using a Version Control System, please read the
# header note.
#Mon Aug 27 12:46:27 JST 2018
ndk.dir=/usr/local/google/home/yaraki/Android/Sdk/ndk-bundle
sdk.dir=/usr/local/google/home/yaraki/Android/Sdk
28 changes: 15 additions & 13 deletions playground/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,12 @@ apply plugin: 'kotlin-android'
apply plugin: 'kotlin-kapt'

android {
compileSdkVersion 27
compileSdkVersion versions.compileSdk

defaultConfig {
applicationId "com.example.android.playground"
minSdkVersion 14
targetSdkVersion 27
minSdkVersion versions.minSdk
targetSdkVersion versions.targetSdk
versionCode 1
versionName "1.0"

Expand Down Expand Up @@ -53,19 +53,21 @@ dependencies {
implementation fileTree(dir: 'libs', include: ['*.jar'])

// Kotlin
compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlinVersion"
compile "org.jetbrains.kotlin:kotlin-stdlib:$versions.kotlin"

implementation "com.android.support:support-annotations:$versions.support"

// Architecture Components
implementation "android.arch.lifecycle:extensions:$lifecycleVersion"
implementation "android.arch.persistence.room:runtime:$roomVersion"
annotationProcessor "android.arch.persistence.room:compiler:$roomVersion"
kapt "android.arch.persistence.room:compiler:$roomVersion"
androidTestImplementation "android.arch.persistence.room:testing:$roomVersion"
implementation "android.arch.lifecycle:extensions:$versions.lifecycle"
implementation "android.arch.persistence.room:runtime:$versions.room"
annotationProcessor "android.arch.persistence.room:compiler:$versions.room"
kapt "android.arch.persistence.room:compiler:$versions.room"
androidTestImplementation "android.arch.persistence.room:testing:$versions.room"

// Tests
testImplementation 'junit:junit:4.12'
testImplementation 'org.mockito:mockito-core:2.13.0'
androidTestImplementation 'org.mockito:mockito-android:2.13.0'
androidTestImplementation 'com.android.support.test:runner:1.0.1'
androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.1'
testImplementation "org.mockito:mockito-core:$versions.mockito"
androidTestImplementation "org.mockito:mockito-android:$versions.mockito"
androidTestImplementation "com.android.support.test:runner:$versions.runner"
androidTestImplementation "com.android.support.test.espresso:espresso-core:$versions.espresso"
}

0 comments on commit 7f8ac79

Please sign in to comment.