aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--README.md4
-rw-r--r--about/build.gradle6
-rw-r--r--adapter/build.gradle6
-rw-r--r--build.gradle10
-rw-r--r--colorpicker/build.gradle4
-rw-r--r--core-ui/build.gradle4
-rw-r--r--core/build.gradle22
-rw-r--r--docs/Changelog.md4
-rw-r--r--gradle.properties6
-rw-r--r--gradle/wrapper/gradle-wrapper.properties4
-rw-r--r--kpref-activity/build.gradle5
-rw-r--r--mediapicker/build.gradle7
-rw-r--r--sample/build.gradle31
-rw-r--r--sample/src/main/res/xml/kau_changelog.xml11
-rw-r--r--searchview/build.gradle4
15 files changed, 68 insertions, 60 deletions
diff --git a/README.md b/README.md
index 6d21157..cf3215c 100644
--- a/README.md
+++ b/README.md
@@ -60,7 +60,9 @@ dependencies {
# Submodules
> Linked to their respective docs.<br/>
> Included dependencies are only those with exposed APIs; see [new dependency configurations](https://developer.android.com/studio/build/gradle-plugin-3-0-0-migration.html#new_configurations).<br/>
-> Implemented dependencies are wrapped in parentheses.
+> Implemented external dependencies are wrapped in parentheses.
+> All KAU submodule dependencies are implemented, with the exception of `core` in `core-ui`.
+This means that you'll need to explicitly include each submodule you'd like to use, even if another declared submodule depends on it.
## [Core](core#readme)
* Collection of extension functions and small helper methods applicable in almost any application.
diff --git a/about/build.gradle b/about/build.gradle
index 3ee1a48..4794178 100644
--- a/about/build.gradle
+++ b/about/build.gradle
@@ -7,10 +7,10 @@ android {
}
dependencies {
- compile project(':core-ui')
- compile project(':adapter')
+ implementation project(':core-ui')
+ implementation project(':adapter')
- compile("com.mikepenz:aboutlibraries:${ABOUT_LIBRARIES}@aar") {
+ api("com.mikepenz:aboutlibraries:${ABOUT_LIBRARIES}@aar") {
transitive = false
}
}
diff --git a/adapter/build.gradle b/adapter/build.gradle
index 15708dc..97d70f5 100644
--- a/adapter/build.gradle
+++ b/adapter/build.gradle
@@ -3,10 +3,10 @@ ext.kauSubModuleMinSdk = project.CORE_MIN_SDK
apply from: '../android-lib.gradle'
dependencies {
- compile project(':core')
+ implementation project(':core')
- compile "com.mikepenz:fastadapter:${FAST_ADAPTER}@aar"
- compile "com.mikepenz:fastadapter-commons:${FAST_ADAPTER_COMMONS}@aar"
+ api "com.mikepenz:fastadapter:${FAST_ADAPTER}@aar"
+ api "com.mikepenz:fastadapter-commons:${FAST_ADAPTER_COMMONS}@aar"
}
apply from: '../artifacts.gradle'
diff --git a/build.gradle b/build.gradle
index 74fb18d..19f3436 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,15 +1,14 @@
// Top-level build file where you can add configuration options common to all sub-projects/modules.
buildscript {
repositories {
-// google()
-// maven { url "https://maven.google.com" }
+ google()
jcenter()
maven { url 'https://maven.fabric.io/public' }
}
dependencies {
- classpath 'com.android.tools.build:gradle:2.3.3'
+ classpath 'com.android.tools.build:gradle:3.0.0-beta3'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:${KOTLIN}"
- classpath 'com.github.dcendents:android-maven-gradle-plugin:1.5'
+ classpath 'com.github.dcendents:android-maven-gradle-plugin:2.0'
classpath 'com.github.triplet.gradle:play-publisher:1.2.0'
// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
@@ -52,8 +51,7 @@ task generateChangelogMd {
subprojects {
repositories {
-// google()
- maven { url "https://maven.google.com" }
+ google()
jcenter()
maven { url "https://jitpack.io" }
}
diff --git a/colorpicker/build.gradle b/colorpicker/build.gradle
index f6e412a..9310be3 100644
--- a/colorpicker/build.gradle
+++ b/colorpicker/build.gradle
@@ -5,9 +5,9 @@ ext.kauSubModuleMinSdk = project.CORE_MIN_SDK
apply from: '../android-lib.gradle'
dependencies {
- compile project(':core')
+ implementation project(':core')
- compile "com.afollestad.material-dialogs:commons:${MATERIAL_DIALOG}"
+ implementation "com.afollestad.material-dialogs:commons:${MATERIAL_DIALOG}"
}
apply from: '../artifacts.gradle'
diff --git a/core-ui/build.gradle b/core-ui/build.gradle
index 68764b5..1e7a58b 100644
--- a/core-ui/build.gradle
+++ b/core-ui/build.gradle
@@ -3,8 +3,8 @@ ext.kauSubModuleMinSdk = project.CORE_MIN_SDK
apply from: '../android-lib.gradle'
dependencies {
- compile project(':core')
- compile project(':adapter')
+ api project(':core')
+ implementation project(':adapter')
}
diff --git a/core/build.gradle b/core/build.gradle
index cdd7859..23ed412 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -3,21 +3,21 @@ ext.kauSubModuleMinSdk = project.CORE_MIN_SDK
apply from: '../android-lib.gradle'
dependencies {
- compile "org.jetbrains.kotlin:kotlin-stdlib:${KOTLIN}"
+ api "org.jetbrains.kotlin:kotlin-stdlib:${KOTLIN}"
- compile "com.android.support:appcompat-v7:${ANDROID_SUPPORT_LIBS}"
- compile "com.android.support:support-v13:${ANDROID_SUPPORT_LIBS}"
- compile "com.android.support:design:${ANDROID_SUPPORT_LIBS}"
- compile "com.android.support:recyclerview-v7:${ANDROID_SUPPORT_LIBS}"
- compile "com.android.support:cardview-v7:${ANDROID_SUPPORT_LIBS}"
- compile "com.android.support.constraint:constraint-layout:${CONSTRAINT_LAYOUT}"
+ api "com.android.support:appcompat-v7:${ANDROID_SUPPORT_LIBS}"
+ api "com.android.support:support-v13:${ANDROID_SUPPORT_LIBS}"
+ api "com.android.support:design:${ANDROID_SUPPORT_LIBS}"
+ api "com.android.support:recyclerview-v7:${ANDROID_SUPPORT_LIBS}"
+ api "com.android.support:cardview-v7:${ANDROID_SUPPORT_LIBS}"
+ api "com.android.support.constraint:constraint-layout:${CONSTRAINT_LAYOUT}"
- compile "com.mikepenz:iconics-core:${ICONICS}@aar"
- compile "com.mikepenz:google-material-typeface:${IICON_GOOGLE}.original@aar"
+ api "com.mikepenz:iconics-core:${ICONICS}@aar"
+ api "com.mikepenz:google-material-typeface:${IICON_GOOGLE}.original@aar"
- compile "com.afollestad.material-dialogs:core:${MATERIAL_DIALOG}"
+ api "com.afollestad.material-dialogs:core:${MATERIAL_DIALOG}"
- compile "org.jetbrains.anko:anko-commons:${ANKO}"
+ api "org.jetbrains.anko:anko-commons:${ANKO}"
}
apply from: '../artifacts.gradle'
diff --git a/docs/Changelog.md b/docs/Changelog.md
index e20540f..63927a7 100644
--- a/docs/Changelog.md
+++ b/docs/Changelog.md
@@ -1,5 +1,9 @@
# Changelog
+## v3.4.0
+* Update to gradle 4.x; api and implementation rather than compile
+* Update dependencies
+
## v3.3.2
* :kpref-activity: Add visibility toggle to Core contract. Items can override this to show/hide given preferences based on boolean callbacks.
* :kpref-activity: Add width constraint for long text items
diff --git a/gradle.properties b/gradle.properties
index c0d946e..ad3a84a 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -21,7 +21,7 @@ CORE_MIN_SDK=19
MIN_SDK=21
TARGET_SDK=26
BUILD_TOOLS=26.0.1
-ANDROID_SUPPORT_LIBS=26.0.0
+ANDROID_SUPPORT_LIBS=26.0.1
VERSION_NAME=3.3.3
@@ -33,9 +33,9 @@ CONSTRAINT_LAYOUT=1.1.0-beta1
FAST_ADAPTER=2.6.3
FAST_ADAPTER_COMMONS=2.6.3
GLIDE=4.0.0
-ICONICS=2.9.1
+ICONICS=2.9.3
IICON_GOOGLE=3.0.1.1
-MATERIAL_DIALOG=0.9.4.5
+MATERIAL_DIALOG=0.9.4.7
ESPRESSO=3.0.0
JUNIT=4.12
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 01f9c48..47b34c0 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Wed Jun 07 22:36:24 PDT 2017
+#Tue Aug 29 17:23:46 EDT 2017
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip
diff --git a/kpref-activity/build.gradle b/kpref-activity/build.gradle
index e0849d4..62c069d 100644
--- a/kpref-activity/build.gradle
+++ b/kpref-activity/build.gradle
@@ -5,8 +5,9 @@ ext.kauSubModuleResourcePrefix = "kau_pref_"
apply from: '../android-lib.gradle'
dependencies {
- compile project(':adapter')
- compile project(':colorpicker')
+ implementation project(':core')
+ implementation project(':adapter')
+ implementation project(':colorpicker')
}
apply from: '../artifacts.gradle'
diff --git a/mediapicker/build.gradle b/mediapicker/build.gradle
index 813ec20..eff6a77 100644
--- a/mediapicker/build.gradle
+++ b/mediapicker/build.gradle
@@ -3,11 +3,12 @@ ext.kauSubModuleMinSdk = project.CORE_MIN_SDK
apply from: '../android-lib.gradle'
dependencies {
- compile project(':core-ui')
+ implementation project(':core-ui')
+ implementation project(':adapter')
- compile "com.github.bumptech.glide:glide:${GLIDE}"
+ api "com.github.bumptech.glide:glide:${GLIDE}"
kapt "com.github.bumptech.glide:compiler:${GLIDE}"
- compile "jp.wasabeef:blurry:${BLURRY}"
+ implementation "jp.wasabeef:blurry:${BLURRY}"
}
apply from: '../artifacts.gradle'
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" />
diff --git a/searchview/build.gradle b/searchview/build.gradle
index 642d11a..39a3662 100644
--- a/searchview/build.gradle
+++ b/searchview/build.gradle
@@ -3,8 +3,8 @@ ext.kauSubModuleResourcePrefix = "kau_search_"
apply from: '../android-lib.gradle'
dependencies {
- compile project(':core-ui')
- compile project(':adapter')
+ implementation project(':core-ui')
+ implementation project(':adapter')
}
apply from: '../artifacts.gradle'
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-24 01:34:53 +0000