From 33977d96c6d19a0696dcc08423baba925b219fc3 Mon Sep 17 00:00:00 2001
From: Allan Wang <me@allanwang.ca>
Date: Tue, 29 Aug 2017 18:06:56 -0400
Subject: Feature/gradle 4.x (#47)

* Update to api and implementation

* Update gradle

* Add missing dependency

* Update readme

* Update external dependencies
---
 sample/build.gradle                       | 31 +++++++++++++++----------------
 sample/src/main/res/xml/kau_changelog.xml | 11 +++++++----
 2 files changed, 22 insertions(+), 20 deletions(-)

(limited to 'sample')

diff --git a/sample/build.gradle b/sample/build.gradle
index ac6ee20..6526306 100644
--- a/sample/build.gradle
+++ b/sample/build.gradle
@@ -81,25 +81,24 @@ android {
 }
 
 dependencies {
-    compile fileTree(dir: 'libs', include: ['*.jar'])
-    compile project(':about')
-    compile project(':adapter')
-    compile project(':colorpicker')
-    compile project(':core')
-    compile project(':core-ui')
-    compile project(':kpref-activity')
-    compile project(':searchview')
-    compile project(':mediapicker')
-    compile "com.mikepenz:google-material-typeface:${IICON_GOOGLE}.original@aar"
-    compile "org.jetbrains.kotlin:kotlin-stdlib:${KOTLIN}"
+    implementation project(':about')
+    implementation project(':adapter')
+    implementation project(':colorpicker')
+    implementation project(':core')
+    implementation project(':core-ui')
+    implementation project(':kpref-activity')
+    implementation project(':searchview')
+    implementation project(':mediapicker')
+    implementation "com.mikepenz:google-material-typeface:${IICON_GOOGLE}.original@aar"
+    implementation "org.jetbrains.kotlin:kotlin-stdlib:${KOTLIN}"
 
-    androidTestCompile("com.android.support.test.espresso:espresso-core:${ESPRESSO}") {
+    androidTestImplementation("com.android.support.test.espresso:espresso-core:${ESPRESSO}") {
         exclude group: 'com.android.support', module: 'support-annotations'
     }
-    androidTestCompile("com.android.support.test:runner:${TEST_RUNNER}") {
+    androidTestImplementation("com.android.support.test:runner:${TEST_RUNNER}") {
         exclude group: 'com.android.support', module: 'support-annotations'
     }
-    androidTestCompile "org.jetbrains.kotlin:kotlin-test-junit:${KOTLIN}"
-    testCompile "org.jetbrains.kotlin:kotlin-test-junit:${KOTLIN}"
-    testCompile "junit:junit:${JUNIT}"
+    androidTestImplementation "org.jetbrains.kotlin:kotlin-test-junit:${KOTLIN}"
+    testImplementation "org.jetbrains.kotlin:kotlin-test-junit:${KOTLIN}"
+    testImplementation "junit:junit:${JUNIT}"
 }
diff --git a/sample/src/main/res/xml/kau_changelog.xml b/sample/src/main/res/xml/kau_changelog.xml
index 1d46757..87611f8 100644
--- a/sample/src/main/res/xml/kau_changelog.xml
+++ b/sample/src/main/res/xml/kau_changelog.xml
@@ -5,13 +5,16 @@
     <version title="v"/>
     <item text="" />
     -->
-	
+
+    <version title="v3.4.0"/>
+    <item text="Update to gradle 4.x; api and implementation rather than compile" />
+    <item text="Update dependencies" />
+    <item text="" />
+    <item text="" />
+
 	<version title="v3.3.2"/>
     <item text=":kpref-activity: Add visibility toggle to Core contract. Items can override this to show/hide given preferences based on boolean callbacks." />
 	<item text=":kpref-activity: Add width constraint for long text items" />
-	<item text="" />
-	<item text="" />
-	<item text="" />
 	
 	<version title="v3.3.1"/>
     <item text=":core: Open up all logger functions" />
-- 
cgit v1.2.3