diff --git a/11_Kotlin/ShoppingKotlin/.gitignore b/11_Kotlin/ShoppingKotlin/.gitignore index 39fb081..09b993d 100644 --- a/11_Kotlin/ShoppingKotlin/.gitignore +++ b/11_Kotlin/ShoppingKotlin/.gitignore @@ -1,8 +1,7 @@ *.iml .gradle /local.properties -/.idea/workspace.xml -/.idea/libraries +/.idea .DS_Store /build /captures diff --git a/11_Kotlin/ShoppingKotlin/app/build.gradle b/11_Kotlin/ShoppingKotlin/app/build.gradle index 602d018..76bfa15 100644 --- a/11_Kotlin/ShoppingKotlin/app/build.gradle +++ b/11_Kotlin/ShoppingKotlin/app/build.gradle @@ -20,23 +20,15 @@ android { } } -repositories { - mavenCentral() - google() -} - dependencies { - compile fileTree(dir: 'libs', include: ['*.jar']) - androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', { - exclude group: 'com.android.support', module: 'support-annotations' - }) - testCompile 'junit:junit:4.12' + implementation fileTree(dir: 'libs', include: ['*.jar']) - compile "org.jetbrains.kotlin:kotlin-stdlib-jre7:$kotlin_version" + implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" - compile 'com.android.support:appcompat-v7:27.0.2' - compile "com.android.support:recyclerview-v7:27.0.2" - compile "com.android.support:design:27.0.2" + def supportLibraryVersion = "27.1.1" + implementation "com.android.support:appcompat-v7:$supportLibraryVersion" + implementation "com.android.support:recyclerview-v7:$supportLibraryVersion" + implementation "com.android.support:design:$supportLibraryVersion" - compile 'com.android.support.constraint:constraint-layout:1.0.2' + implementation 'com.android.support.constraint:constraint-layout:1.1.0' } diff --git a/11_Kotlin/ShoppingKotlin/app/src/main/res/layout/content_main.xml b/11_Kotlin/ShoppingKotlin/app/src/main/res/layout/content_main.xml index 5cd81ef..ac32ff6 100644 --- a/11_Kotlin/ShoppingKotlin/app/src/main/res/layout/content_main.xml +++ b/11_Kotlin/ShoppingKotlin/app/src/main/res/layout/content_main.xml @@ -12,7 +12,7 @@ android:layout_height="0dp" android:clipToPadding="false" android:padding="4dp" - app:layoutManager="LinearLayoutManager" + app:layoutManager="android.support.v7.widget.LinearLayoutManager" app:layout_behavior="@string/appbar_scrolling_view_behavior" app:layout_constraintBottom_toTopOf="@+id/ilName" app:layout_constraintLeft_toLeftOf="parent" diff --git a/11_Kotlin/ShoppingKotlin/build.gradle b/11_Kotlin/ShoppingKotlin/build.gradle index d6522c6..1f6fd0f 100644 --- a/11_Kotlin/ShoppingKotlin/build.gradle +++ b/11_Kotlin/ShoppingKotlin/build.gradle @@ -1,21 +1,20 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. buildscript { - ext.kotlin_version = '1.2.0' + ext.kotlin_version = '1.2.41' repositories { + google() jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:3.0.1' + classpath 'com.android.tools.build:gradle:3.1.2' 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 } } allprojects { repositories { + google() jcenter() } } diff --git a/11_Kotlin/ShoppingKotlin/gradle/wrapper/gradle-wrapper.properties b/11_Kotlin/ShoppingKotlin/gradle/wrapper/gradle-wrapper.properties index 383ea72..a140e79 100644 --- a/11_Kotlin/ShoppingKotlin/gradle/wrapper/gradle-wrapper.properties +++ b/11_Kotlin/ShoppingKotlin/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Tue Dec 05 13:58:51 CET 2017 +#Sun May 13 18:33:14 CEST 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