From 3dd239101215c8c7404fa87f11a1839be047574c Mon Sep 17 00:00:00 2001 From: Louis CAD Date: Thu, 5 Jul 2018 23:51:37 +0200 Subject: [PATCH 001/167] Prepare next development version. --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 30df544e6..a3be908d5 100644 --- a/build.gradle +++ b/build.gradle @@ -45,7 +45,7 @@ allprojects { // Libraries groupId = "com.louiscad.splitties" - library_version = "2.0.0-alpha4" + library_version = "2.0.0-SNAPSHOT" isSnapshot = library_version.endsWith("-SNAPSHOT") isRelease = !isSnapshot From 12390ba54f7fffe4ac23de6bc920b295278a5080 Mon Sep 17 00:00:00 2001 From: Louis CAD Date: Wed, 8 Aug 2018 22:28:02 +0200 Subject: [PATCH 002/167] AGP 3.2.0-beta05 --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index a3be908d5..aa3158c90 100644 --- a/build.gradle +++ b/build.gradle @@ -23,7 +23,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:3.2.0-beta02' + classpath 'com.android.tools.build:gradle:3.2.0-beta05' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.0' classpath 'com.github.dcendents:android-maven-gradle-plugin:2.0' From c57a6076b1c0a9a68ff36784cdf55477fdc6f77d Mon Sep 17 00:00:00 2001 From: Louis CAD Date: Wed, 8 Aug 2018 22:28:23 +0200 Subject: [PATCH 003/167] Kotlin 1.2.60 --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index aa3158c90..9cf2846a6 100644 --- a/build.gradle +++ b/build.gradle @@ -17,7 +17,7 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. buildscript { - ext.kotlin_version = '1.2.51' + ext.kotlin_version = '1.2.60' repositories { google() jcenter() From bce7078285546ce671b3e4d891b4721d4b3897b8 Mon Sep 17 00:00:00 2001 From: Louis CAD Date: Sun, 8 Jul 2018 17:52:21 +0200 Subject: [PATCH 004/167] Enable gradle parallel mode (cherry picked from commit 8aa81b4) --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index aac7c9b46..7f4d8fb0f 100644 --- a/gradle.properties +++ b/gradle.properties @@ -14,4 +14,4 @@ org.gradle.jvmargs=-Xmx1536m # 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 +org.gradle.parallel=true From cbc4780dff9442e35fd3ad0030ab5bdaf855cec8 Mon Sep 17 00:00:00 2001 From: Louis CAD Date: Sun, 8 Jul 2018 18:01:42 +0200 Subject: [PATCH 005/167] Remove useless proguard rules for library modules (cherry picked from commit cd15c69) --- activities/build.gradle | 1 - activities/proguard-rules.pro | 21 ---------------- alertdialog-appcompat/build.gradle | 1 - alertdialog-appcompat/proguard-rules.pro | 21 ---------------- alertdialog/build.gradle | 1 - alertdialog/proguard-rules.pro | 21 ---------------- appctx/build.gradle | 1 - appctx/proguard-rules.pro | 25 ------------------- arch-lifecycle/build.gradle | 1 - arch-lifecycle/proguard-rules.pro | 21 ---------------- arch-room/build.gradle | 1 - arch-room/proguard-rules.pro | 21 ---------------- bitflags/build.gradle | 1 - bitflags/proguard-rules.pro | 21 ---------------- bundle/build.gradle | 1 - bundle/proguard-rules.pro | 21 ---------------- checkedlazy/build.gradle | 1 - checkedlazy/proguard-rules.pro | 25 ------------------- collections/build.gradle | 1 - collections/proguard-rules.pro | 21 ---------------- dimensions/build.gradle | 1 - dimensions/proguard-rules.pro | 21 ---------------- exceptions/build.gradle | 1 - exceptions/proguard-rules.pro | 21 ---------------- fragmentargs/build.gradle | 1 - fragmentargs/proguard-rules.pro | 21 ---------------- fragments/build.gradle | 1 - fragments/proguard-rules.pro | 21 ---------------- initprovider/build.gradle | 1 - initprovider/proguard-rules.pro | 21 ---------------- intents/build.gradle | 1 - intents/proguard-rules.pro | 21 ---------------- mainhandler/build.gradle | 1 - mainhandler/proguard-rules.pro | 21 ---------------- material-colors/build.gradle | 1 - material-colors/proguard-rules.pro | 21 ---------------- material-lists/build.gradle | 1 - material-lists/proguard-rules.pro | 25 ------------------- preferences/build.gradle | 1 - preferences/proguard-rules.pro | 25 ------------------- resources/build.gradle | 1 - resources/proguard-rules.pro | 21 ---------------- selectableviews-appcompat/build.gradle | 1 - selectableviews-appcompat/proguard-rules.pro | 21 ---------------- selectableviews-constraintlayout/build.gradle | 1 - .../proguard-rules.pro | 21 ---------------- selectableviews/build.gradle | 1 - selectableviews/proguard-rules.pro | 17 ------------- snackbar/build.gradle | 1 - snackbar/proguard-rules.pro | 21 ---------------- stetho-init/build.gradle | 1 - stetho-init/proguard-rules.pro | 25 ------------------- systemservices/build.gradle | 1 - systemservices/proguard-rules.pro | 21 ---------------- toast/build.gradle | 1 - toast/proguard-rules.pro | 21 ---------------- typesaferecyclerview/build.gradle | 1 - typesaferecyclerview/proguard-rules.pro | 17 ------------- uithread/build.gradle | 1 - uithread/proguard-rules.pro | 21 ---------------- viewdsl-appcompat-styles/build.gradle | 1 - viewdsl-appcompat-styles/proguard-rules.pro | 21 ---------------- viewdsl-appcompat/build.gradle | 1 - viewdsl-appcompat/proguard-rules.pro | 21 ---------------- viewdsl-constraintlayout/build.gradle | 1 - viewdsl-constraintlayout/proguard-rules.pro | 21 ---------------- viewdsl-design/build.gradle | 1 - viewdsl-design/proguard-rules.pro | 21 ---------------- viewdsl-ide-preview/build.gradle | 1 - viewdsl-ide-preview/proguard-rules.pro | 21 ---------------- viewdsl-recyclerview/build.gradle | 1 - viewdsl-recyclerview/proguard-rules.pro | 21 ---------------- viewdsl/build.gradle | 1 - viewdsl/proguard-rules.pro | 21 ---------------- views-appcompat/build.gradle | 1 - views-appcompat/proguard-rules.pro | 21 ---------------- views-cardview/build.gradle | 1 - views-cardview/proguard-rules.pro | 21 ---------------- views-design/build.gradle | 1 - views-design/proguard-rules.pro | 21 ---------------- views-recyclerview/build.gradle | 1 - views-recyclerview/proguard-rules.pro | 21 ---------------- views/build.gradle | 1 - views/proguard-rules.pro | 21 ---------------- 84 files changed, 936 deletions(-) delete mode 100644 activities/proguard-rules.pro delete mode 100644 alertdialog-appcompat/proguard-rules.pro delete mode 100644 alertdialog/proguard-rules.pro delete mode 100644 appctx/proguard-rules.pro delete mode 100644 arch-lifecycle/proguard-rules.pro delete mode 100644 arch-room/proguard-rules.pro delete mode 100644 bitflags/proguard-rules.pro delete mode 100644 bundle/proguard-rules.pro delete mode 100644 checkedlazy/proguard-rules.pro delete mode 100644 collections/proguard-rules.pro delete mode 100644 dimensions/proguard-rules.pro delete mode 100644 exceptions/proguard-rules.pro delete mode 100644 fragmentargs/proguard-rules.pro delete mode 100644 fragments/proguard-rules.pro delete mode 100644 initprovider/proguard-rules.pro delete mode 100644 intents/proguard-rules.pro delete mode 100644 mainhandler/proguard-rules.pro delete mode 100644 material-colors/proguard-rules.pro delete mode 100644 material-lists/proguard-rules.pro delete mode 100644 preferences/proguard-rules.pro delete mode 100644 resources/proguard-rules.pro delete mode 100644 selectableviews-appcompat/proguard-rules.pro delete mode 100644 selectableviews-constraintlayout/proguard-rules.pro delete mode 100644 selectableviews/proguard-rules.pro delete mode 100644 snackbar/proguard-rules.pro delete mode 100644 stetho-init/proguard-rules.pro delete mode 100644 systemservices/proguard-rules.pro delete mode 100644 toast/proguard-rules.pro delete mode 100644 typesaferecyclerview/proguard-rules.pro delete mode 100644 uithread/proguard-rules.pro delete mode 100644 viewdsl-appcompat-styles/proguard-rules.pro delete mode 100644 viewdsl-appcompat/proguard-rules.pro delete mode 100644 viewdsl-constraintlayout/proguard-rules.pro delete mode 100644 viewdsl-design/proguard-rules.pro delete mode 100644 viewdsl-ide-preview/proguard-rules.pro delete mode 100644 viewdsl-recyclerview/proguard-rules.pro delete mode 100644 viewdsl/proguard-rules.pro delete mode 100644 views-appcompat/proguard-rules.pro delete mode 100644 views-cardview/proguard-rules.pro delete mode 100644 views-design/proguard-rules.pro delete mode 100644 views-recyclerview/proguard-rules.pro delete mode 100644 views/proguard-rules.pro diff --git a/activities/build.gradle b/activities/build.gradle index 0cafd145e..0724c358e 100644 --- a/activities/build.gradle +++ b/activities/build.gradle @@ -30,7 +30,6 @@ android { buildTypes { release { minifyEnabled false - proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' } } sourceSets { diff --git a/activities/proguard-rules.pro b/activities/proguard-rules.pro deleted file mode 100644 index f1b424510..000000000 --- a/activities/proguard-rules.pro +++ /dev/null @@ -1,21 +0,0 @@ -# Add project specific ProGuard rules here. -# You can control the set of applied configuration files using the -# proguardFiles setting in build.gradle. -# -# For more details, see -# http://developer.android.com/guide/developing/tools/proguard.html - -# If your project uses WebView with JS, uncomment the following -# and specify the fully qualified class name to the JavaScript interface -# class: -#-keepclassmembers class fqcn.of.javascript.interface.for.webview { -# public *; -#} - -# Uncomment this to preserve the line number information for -# debugging stack traces. -#-keepattributes SourceFile,LineNumberTable - -# If you keep the line number information, uncomment this to -# hide the original source file name. -#-renamesourcefileattribute SourceFile diff --git a/alertdialog-appcompat/build.gradle b/alertdialog-appcompat/build.gradle index c6df50443..4e032b51f 100644 --- a/alertdialog-appcompat/build.gradle +++ b/alertdialog-appcompat/build.gradle @@ -30,7 +30,6 @@ android { buildTypes { release { minifyEnabled false - proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' } } sourceSets { diff --git a/alertdialog-appcompat/proguard-rules.pro b/alertdialog-appcompat/proguard-rules.pro deleted file mode 100644 index f1b424510..000000000 --- a/alertdialog-appcompat/proguard-rules.pro +++ /dev/null @@ -1,21 +0,0 @@ -# Add project specific ProGuard rules here. -# You can control the set of applied configuration files using the -# proguardFiles setting in build.gradle. -# -# For more details, see -# http://developer.android.com/guide/developing/tools/proguard.html - -# If your project uses WebView with JS, uncomment the following -# and specify the fully qualified class name to the JavaScript interface -# class: -#-keepclassmembers class fqcn.of.javascript.interface.for.webview { -# public *; -#} - -# Uncomment this to preserve the line number information for -# debugging stack traces. -#-keepattributes SourceFile,LineNumberTable - -# If you keep the line number information, uncomment this to -# hide the original source file name. -#-renamesourcefileattribute SourceFile diff --git a/alertdialog/build.gradle b/alertdialog/build.gradle index 0cafd145e..0724c358e 100644 --- a/alertdialog/build.gradle +++ b/alertdialog/build.gradle @@ -30,7 +30,6 @@ android { buildTypes { release { minifyEnabled false - proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' } } sourceSets { diff --git a/alertdialog/proguard-rules.pro b/alertdialog/proguard-rules.pro deleted file mode 100644 index f1b424510..000000000 --- a/alertdialog/proguard-rules.pro +++ /dev/null @@ -1,21 +0,0 @@ -# Add project specific ProGuard rules here. -# You can control the set of applied configuration files using the -# proguardFiles setting in build.gradle. -# -# For more details, see -# http://developer.android.com/guide/developing/tools/proguard.html - -# If your project uses WebView with JS, uncomment the following -# and specify the fully qualified class name to the JavaScript interface -# class: -#-keepclassmembers class fqcn.of.javascript.interface.for.webview { -# public *; -#} - -# Uncomment this to preserve the line number information for -# debugging stack traces. -#-keepattributes SourceFile,LineNumberTable - -# If you keep the line number information, uncomment this to -# hide the original source file name. -#-renamesourcefileattribute SourceFile diff --git a/appctx/build.gradle b/appctx/build.gradle index 260bad585..19051eb3d 100644 --- a/appctx/build.gradle +++ b/appctx/build.gradle @@ -33,7 +33,6 @@ android { buildTypes { release { minifyEnabled false - proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' } } } diff --git a/appctx/proguard-rules.pro b/appctx/proguard-rules.pro deleted file mode 100644 index 74d4a458b..000000000 --- a/appctx/proguard-rules.pro +++ /dev/null @@ -1,25 +0,0 @@ -# Add project specific ProGuard rules here. -# By default, the flags in this file are appended to flags specified -# in /Users/statop/Android/sdk/tools/proguard/proguard-android.txt -# You can edit the include path and order by changing the proguardFiles -# directive in build.gradle. -# -# For more details, see -# http://developer.android.com/guide/developing/tools/proguard.html - -# Add any project specific keep options here: - -# If your project uses WebView with JS, uncomment the following -# and specify the fully qualified class name to the JavaScript interface -# class: -#-keepclassmembers class fqcn.of.javascript.interface.for.webview { -# public *; -#} - -# Uncomment this to preserve the line number information for -# debugging stack traces. -#-keepattributes SourceFile,LineNumberTable - -# If you keep the line number information, uncomment this to -# hide the original source file name. -#-renamesourcefileattribute SourceFile diff --git a/arch-lifecycle/build.gradle b/arch-lifecycle/build.gradle index fb677f824..f7fb52391 100644 --- a/arch-lifecycle/build.gradle +++ b/arch-lifecycle/build.gradle @@ -33,7 +33,6 @@ android { buildTypes { release { minifyEnabled false - proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' } } } diff --git a/arch-lifecycle/proguard-rules.pro b/arch-lifecycle/proguard-rules.pro deleted file mode 100644 index f1b424510..000000000 --- a/arch-lifecycle/proguard-rules.pro +++ /dev/null @@ -1,21 +0,0 @@ -# Add project specific ProGuard rules here. -# You can control the set of applied configuration files using the -# proguardFiles setting in build.gradle. -# -# For more details, see -# http://developer.android.com/guide/developing/tools/proguard.html - -# If your project uses WebView with JS, uncomment the following -# and specify the fully qualified class name to the JavaScript interface -# class: -#-keepclassmembers class fqcn.of.javascript.interface.for.webview { -# public *; -#} - -# Uncomment this to preserve the line number information for -# debugging stack traces. -#-keepattributes SourceFile,LineNumberTable - -# If you keep the line number information, uncomment this to -# hide the original source file name. -#-renamesourcefileattribute SourceFile diff --git a/arch-room/build.gradle b/arch-room/build.gradle index 87162b816..8398d3d51 100644 --- a/arch-room/build.gradle +++ b/arch-room/build.gradle @@ -33,7 +33,6 @@ android { buildTypes { release { minifyEnabled false - proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' } } } diff --git a/arch-room/proguard-rules.pro b/arch-room/proguard-rules.pro deleted file mode 100644 index f1b424510..000000000 --- a/arch-room/proguard-rules.pro +++ /dev/null @@ -1,21 +0,0 @@ -# Add project specific ProGuard rules here. -# You can control the set of applied configuration files using the -# proguardFiles setting in build.gradle. -# -# For more details, see -# http://developer.android.com/guide/developing/tools/proguard.html - -# If your project uses WebView with JS, uncomment the following -# and specify the fully qualified class name to the JavaScript interface -# class: -#-keepclassmembers class fqcn.of.javascript.interface.for.webview { -# public *; -#} - -# Uncomment this to preserve the line number information for -# debugging stack traces. -#-keepattributes SourceFile,LineNumberTable - -# If you keep the line number information, uncomment this to -# hide the original source file name. -#-renamesourcefileattribute SourceFile diff --git a/bitflags/build.gradle b/bitflags/build.gradle index 0cafd145e..0724c358e 100644 --- a/bitflags/build.gradle +++ b/bitflags/build.gradle @@ -30,7 +30,6 @@ android { buildTypes { release { minifyEnabled false - proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' } } sourceSets { diff --git a/bitflags/proguard-rules.pro b/bitflags/proguard-rules.pro deleted file mode 100644 index f1b424510..000000000 --- a/bitflags/proguard-rules.pro +++ /dev/null @@ -1,21 +0,0 @@ -# Add project specific ProGuard rules here. -# You can control the set of applied configuration files using the -# proguardFiles setting in build.gradle. -# -# For more details, see -# http://developer.android.com/guide/developing/tools/proguard.html - -# If your project uses WebView with JS, uncomment the following -# and specify the fully qualified class name to the JavaScript interface -# class: -#-keepclassmembers class fqcn.of.javascript.interface.for.webview { -# public *; -#} - -# Uncomment this to preserve the line number information for -# debugging stack traces. -#-keepattributes SourceFile,LineNumberTable - -# If you keep the line number information, uncomment this to -# hide the original source file name. -#-renamesourcefileattribute SourceFile diff --git a/bundle/build.gradle b/bundle/build.gradle index 0456a9aeb..4fe60dd14 100644 --- a/bundle/build.gradle +++ b/bundle/build.gradle @@ -33,7 +33,6 @@ android { buildTypes { release { minifyEnabled false - proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' } } } diff --git a/bundle/proguard-rules.pro b/bundle/proguard-rules.pro deleted file mode 100644 index f1b424510..000000000 --- a/bundle/proguard-rules.pro +++ /dev/null @@ -1,21 +0,0 @@ -# Add project specific ProGuard rules here. -# You can control the set of applied configuration files using the -# proguardFiles setting in build.gradle. -# -# For more details, see -# http://developer.android.com/guide/developing/tools/proguard.html - -# If your project uses WebView with JS, uncomment the following -# and specify the fully qualified class name to the JavaScript interface -# class: -#-keepclassmembers class fqcn.of.javascript.interface.for.webview { -# public *; -#} - -# Uncomment this to preserve the line number information for -# debugging stack traces. -#-keepattributes SourceFile,LineNumberTable - -# If you keep the line number information, uncomment this to -# hide the original source file name. -#-renamesourcefileattribute SourceFile diff --git a/checkedlazy/build.gradle b/checkedlazy/build.gradle index 6ab615028..3bcd9e3bd 100644 --- a/checkedlazy/build.gradle +++ b/checkedlazy/build.gradle @@ -30,7 +30,6 @@ android { buildTypes { release { minifyEnabled false - proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' } } sourceSets { diff --git a/checkedlazy/proguard-rules.pro b/checkedlazy/proguard-rules.pro deleted file mode 100644 index 74d4a458b..000000000 --- a/checkedlazy/proguard-rules.pro +++ /dev/null @@ -1,25 +0,0 @@ -# Add project specific ProGuard rules here. -# By default, the flags in this file are appended to flags specified -# in /Users/statop/Android/sdk/tools/proguard/proguard-android.txt -# You can edit the include path and order by changing the proguardFiles -# directive in build.gradle. -# -# For more details, see -# http://developer.android.com/guide/developing/tools/proguard.html - -# Add any project specific keep options here: - -# If your project uses WebView with JS, uncomment the following -# and specify the fully qualified class name to the JavaScript interface -# class: -#-keepclassmembers class fqcn.of.javascript.interface.for.webview { -# public *; -#} - -# Uncomment this to preserve the line number information for -# debugging stack traces. -#-keepattributes SourceFile,LineNumberTable - -# If you keep the line number information, uncomment this to -# hide the original source file name. -#-renamesourcefileattribute SourceFile diff --git a/collections/build.gradle b/collections/build.gradle index 014b3e668..0ab2fcc46 100644 --- a/collections/build.gradle +++ b/collections/build.gradle @@ -33,7 +33,6 @@ android { buildTypes { release { minifyEnabled false - proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' } } } diff --git a/collections/proguard-rules.pro b/collections/proguard-rules.pro deleted file mode 100644 index f1b424510..000000000 --- a/collections/proguard-rules.pro +++ /dev/null @@ -1,21 +0,0 @@ -# Add project specific ProGuard rules here. -# You can control the set of applied configuration files using the -# proguardFiles setting in build.gradle. -# -# For more details, see -# http://developer.android.com/guide/developing/tools/proguard.html - -# If your project uses WebView with JS, uncomment the following -# and specify the fully qualified class name to the JavaScript interface -# class: -#-keepclassmembers class fqcn.of.javascript.interface.for.webview { -# public *; -#} - -# Uncomment this to preserve the line number information for -# debugging stack traces. -#-keepattributes SourceFile,LineNumberTable - -# If you keep the line number information, uncomment this to -# hide the original source file name. -#-renamesourcefileattribute SourceFile diff --git a/dimensions/build.gradle b/dimensions/build.gradle index f1d83f2d1..3af52ae8b 100644 --- a/dimensions/build.gradle +++ b/dimensions/build.gradle @@ -33,7 +33,6 @@ android { buildTypes { release { minifyEnabled false - proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' } } } diff --git a/dimensions/proguard-rules.pro b/dimensions/proguard-rules.pro deleted file mode 100644 index f1b424510..000000000 --- a/dimensions/proguard-rules.pro +++ /dev/null @@ -1,21 +0,0 @@ -# Add project specific ProGuard rules here. -# You can control the set of applied configuration files using the -# proguardFiles setting in build.gradle. -# -# For more details, see -# http://developer.android.com/guide/developing/tools/proguard.html - -# If your project uses WebView with JS, uncomment the following -# and specify the fully qualified class name to the JavaScript interface -# class: -#-keepclassmembers class fqcn.of.javascript.interface.for.webview { -# public *; -#} - -# Uncomment this to preserve the line number information for -# debugging stack traces. -#-keepattributes SourceFile,LineNumberTable - -# If you keep the line number information, uncomment this to -# hide the original source file name. -#-renamesourcefileattribute SourceFile diff --git a/exceptions/build.gradle b/exceptions/build.gradle index 014b3e668..0ab2fcc46 100644 --- a/exceptions/build.gradle +++ b/exceptions/build.gradle @@ -33,7 +33,6 @@ android { buildTypes { release { minifyEnabled false - proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' } } } diff --git a/exceptions/proguard-rules.pro b/exceptions/proguard-rules.pro deleted file mode 100644 index f1b424510..000000000 --- a/exceptions/proguard-rules.pro +++ /dev/null @@ -1,21 +0,0 @@ -# Add project specific ProGuard rules here. -# You can control the set of applied configuration files using the -# proguardFiles setting in build.gradle. -# -# For more details, see -# http://developer.android.com/guide/developing/tools/proguard.html - -# If your project uses WebView with JS, uncomment the following -# and specify the fully qualified class name to the JavaScript interface -# class: -#-keepclassmembers class fqcn.of.javascript.interface.for.webview { -# public *; -#} - -# Uncomment this to preserve the line number information for -# debugging stack traces. -#-keepattributes SourceFile,LineNumberTable - -# If you keep the line number information, uncomment this to -# hide the original source file name. -#-renamesourcefileattribute SourceFile diff --git a/fragmentargs/build.gradle b/fragmentargs/build.gradle index 7309110e5..dc3ff587e 100644 --- a/fragmentargs/build.gradle +++ b/fragmentargs/build.gradle @@ -33,7 +33,6 @@ android { buildTypes { release { minifyEnabled false - proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' } } } diff --git a/fragmentargs/proguard-rules.pro b/fragmentargs/proguard-rules.pro deleted file mode 100644 index f1b424510..000000000 --- a/fragmentargs/proguard-rules.pro +++ /dev/null @@ -1,21 +0,0 @@ -# Add project specific ProGuard rules here. -# You can control the set of applied configuration files using the -# proguardFiles setting in build.gradle. -# -# For more details, see -# http://developer.android.com/guide/developing/tools/proguard.html - -# If your project uses WebView with JS, uncomment the following -# and specify the fully qualified class name to the JavaScript interface -# class: -#-keepclassmembers class fqcn.of.javascript.interface.for.webview { -# public *; -#} - -# Uncomment this to preserve the line number information for -# debugging stack traces. -#-keepattributes SourceFile,LineNumberTable - -# If you keep the line number information, uncomment this to -# hide the original source file name. -#-renamesourcefileattribute SourceFile diff --git a/fragments/build.gradle b/fragments/build.gradle index 2ef59738a..1048aaa9a 100644 --- a/fragments/build.gradle +++ b/fragments/build.gradle @@ -33,7 +33,6 @@ android { buildTypes { release { minifyEnabled false - proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' } } } diff --git a/fragments/proguard-rules.pro b/fragments/proguard-rules.pro deleted file mode 100644 index f1b424510..000000000 --- a/fragments/proguard-rules.pro +++ /dev/null @@ -1,21 +0,0 @@ -# Add project specific ProGuard rules here. -# You can control the set of applied configuration files using the -# proguardFiles setting in build.gradle. -# -# For more details, see -# http://developer.android.com/guide/developing/tools/proguard.html - -# If your project uses WebView with JS, uncomment the following -# and specify the fully qualified class name to the JavaScript interface -# class: -#-keepclassmembers class fqcn.of.javascript.interface.for.webview { -# public *; -#} - -# Uncomment this to preserve the line number information for -# debugging stack traces. -#-keepattributes SourceFile,LineNumberTable - -# If you keep the line number information, uncomment this to -# hide the original source file name. -#-renamesourcefileattribute SourceFile diff --git a/initprovider/build.gradle b/initprovider/build.gradle index 37f482d34..432ce72b4 100644 --- a/initprovider/build.gradle +++ b/initprovider/build.gradle @@ -33,7 +33,6 @@ android { buildTypes { release { minifyEnabled false - proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' } } } diff --git a/initprovider/proguard-rules.pro b/initprovider/proguard-rules.pro deleted file mode 100644 index f1b424510..000000000 --- a/initprovider/proguard-rules.pro +++ /dev/null @@ -1,21 +0,0 @@ -# Add project specific ProGuard rules here. -# You can control the set of applied configuration files using the -# proguardFiles setting in build.gradle. -# -# For more details, see -# http://developer.android.com/guide/developing/tools/proguard.html - -# If your project uses WebView with JS, uncomment the following -# and specify the fully qualified class name to the JavaScript interface -# class: -#-keepclassmembers class fqcn.of.javascript.interface.for.webview { -# public *; -#} - -# Uncomment this to preserve the line number information for -# debugging stack traces. -#-keepattributes SourceFile,LineNumberTable - -# If you keep the line number information, uncomment this to -# hide the original source file name. -#-renamesourcefileattribute SourceFile diff --git a/intents/build.gradle b/intents/build.gradle index 377b92924..7cd30fb76 100644 --- a/intents/build.gradle +++ b/intents/build.gradle @@ -30,7 +30,6 @@ android { buildTypes { release { minifyEnabled false - proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' } } sourceSets { diff --git a/intents/proguard-rules.pro b/intents/proguard-rules.pro deleted file mode 100644 index f1b424510..000000000 --- a/intents/proguard-rules.pro +++ /dev/null @@ -1,21 +0,0 @@ -# Add project specific ProGuard rules here. -# You can control the set of applied configuration files using the -# proguardFiles setting in build.gradle. -# -# For more details, see -# http://developer.android.com/guide/developing/tools/proguard.html - -# If your project uses WebView with JS, uncomment the following -# and specify the fully qualified class name to the JavaScript interface -# class: -#-keepclassmembers class fqcn.of.javascript.interface.for.webview { -# public *; -#} - -# Uncomment this to preserve the line number information for -# debugging stack traces. -#-keepattributes SourceFile,LineNumberTable - -# If you keep the line number information, uncomment this to -# hide the original source file name. -#-renamesourcefileattribute SourceFile diff --git a/mainhandler/build.gradle b/mainhandler/build.gradle index a6d1a48d6..869785cdd 100644 --- a/mainhandler/build.gradle +++ b/mainhandler/build.gradle @@ -30,7 +30,6 @@ android { buildTypes { release { minifyEnabled false - proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' } } sourceSets { diff --git a/mainhandler/proguard-rules.pro b/mainhandler/proguard-rules.pro deleted file mode 100644 index f1b424510..000000000 --- a/mainhandler/proguard-rules.pro +++ /dev/null @@ -1,21 +0,0 @@ -# Add project specific ProGuard rules here. -# You can control the set of applied configuration files using the -# proguardFiles setting in build.gradle. -# -# For more details, see -# http://developer.android.com/guide/developing/tools/proguard.html - -# If your project uses WebView with JS, uncomment the following -# and specify the fully qualified class name to the JavaScript interface -# class: -#-keepclassmembers class fqcn.of.javascript.interface.for.webview { -# public *; -#} - -# Uncomment this to preserve the line number information for -# debugging stack traces. -#-keepattributes SourceFile,LineNumberTable - -# If you keep the line number information, uncomment this to -# hide the original source file name. -#-renamesourcefileattribute SourceFile diff --git a/material-colors/build.gradle b/material-colors/build.gradle index 729940a86..1303a7924 100644 --- a/material-colors/build.gradle +++ b/material-colors/build.gradle @@ -32,7 +32,6 @@ android { buildTypes { release { minifyEnabled false - proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' } } } diff --git a/material-colors/proguard-rules.pro b/material-colors/proguard-rules.pro deleted file mode 100644 index f1b424510..000000000 --- a/material-colors/proguard-rules.pro +++ /dev/null @@ -1,21 +0,0 @@ -# Add project specific ProGuard rules here. -# You can control the set of applied configuration files using the -# proguardFiles setting in build.gradle. -# -# For more details, see -# http://developer.android.com/guide/developing/tools/proguard.html - -# If your project uses WebView with JS, uncomment the following -# and specify the fully qualified class name to the JavaScript interface -# class: -#-keepclassmembers class fqcn.of.javascript.interface.for.webview { -# public *; -#} - -# Uncomment this to preserve the line number information for -# debugging stack traces. -#-keepattributes SourceFile,LineNumberTable - -# If you keep the line number information, uncomment this to -# hide the original source file name. -#-renamesourcefileattribute SourceFile diff --git a/material-lists/build.gradle b/material-lists/build.gradle index 8fc47348b..717c78b6a 100644 --- a/material-lists/build.gradle +++ b/material-lists/build.gradle @@ -30,7 +30,6 @@ android { buildTypes { release { minifyEnabled false - proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' } } sourceSets { diff --git a/material-lists/proguard-rules.pro b/material-lists/proguard-rules.pro deleted file mode 100644 index 74d4a458b..000000000 --- a/material-lists/proguard-rules.pro +++ /dev/null @@ -1,25 +0,0 @@ -# Add project specific ProGuard rules here. -# By default, the flags in this file are appended to flags specified -# in /Users/statop/Android/sdk/tools/proguard/proguard-android.txt -# You can edit the include path and order by changing the proguardFiles -# directive in build.gradle. -# -# For more details, see -# http://developer.android.com/guide/developing/tools/proguard.html - -# Add any project specific keep options here: - -# If your project uses WebView with JS, uncomment the following -# and specify the fully qualified class name to the JavaScript interface -# class: -#-keepclassmembers class fqcn.of.javascript.interface.for.webview { -# public *; -#} - -# Uncomment this to preserve the line number information for -# debugging stack traces. -#-keepattributes SourceFile,LineNumberTable - -# If you keep the line number information, uncomment this to -# hide the original source file name. -#-renamesourcefileattribute SourceFile diff --git a/preferences/build.gradle b/preferences/build.gradle index ecb4a9c77..689616f19 100644 --- a/preferences/build.gradle +++ b/preferences/build.gradle @@ -33,7 +33,6 @@ android { buildTypes { release { minifyEnabled false - proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' } } } diff --git a/preferences/proguard-rules.pro b/preferences/proguard-rules.pro deleted file mode 100644 index 74d4a458b..000000000 --- a/preferences/proguard-rules.pro +++ /dev/null @@ -1,25 +0,0 @@ -# Add project specific ProGuard rules here. -# By default, the flags in this file are appended to flags specified -# in /Users/statop/Android/sdk/tools/proguard/proguard-android.txt -# You can edit the include path and order by changing the proguardFiles -# directive in build.gradle. -# -# For more details, see -# http://developer.android.com/guide/developing/tools/proguard.html - -# Add any project specific keep options here: - -# If your project uses WebView with JS, uncomment the following -# and specify the fully qualified class name to the JavaScript interface -# class: -#-keepclassmembers class fqcn.of.javascript.interface.for.webview { -# public *; -#} - -# Uncomment this to preserve the line number information for -# debugging stack traces. -#-keepattributes SourceFile,LineNumberTable - -# If you keep the line number information, uncomment this to -# hide the original source file name. -#-renamesourcefileattribute SourceFile diff --git a/resources/build.gradle b/resources/build.gradle index d0cc658ab..057270d3d 100644 --- a/resources/build.gradle +++ b/resources/build.gradle @@ -33,7 +33,6 @@ android { buildTypes { release { minifyEnabled false - proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' } } } diff --git a/resources/proguard-rules.pro b/resources/proguard-rules.pro deleted file mode 100644 index f1b424510..000000000 --- a/resources/proguard-rules.pro +++ /dev/null @@ -1,21 +0,0 @@ -# Add project specific ProGuard rules here. -# You can control the set of applied configuration files using the -# proguardFiles setting in build.gradle. -# -# For more details, see -# http://developer.android.com/guide/developing/tools/proguard.html - -# If your project uses WebView with JS, uncomment the following -# and specify the fully qualified class name to the JavaScript interface -# class: -#-keepclassmembers class fqcn.of.javascript.interface.for.webview { -# public *; -#} - -# Uncomment this to preserve the line number information for -# debugging stack traces. -#-keepattributes SourceFile,LineNumberTable - -# If you keep the line number information, uncomment this to -# hide the original source file name. -#-renamesourcefileattribute SourceFile diff --git a/selectableviews-appcompat/build.gradle b/selectableviews-appcompat/build.gradle index 3dc1a1924..c92dd2a6f 100644 --- a/selectableviews-appcompat/build.gradle +++ b/selectableviews-appcompat/build.gradle @@ -30,7 +30,6 @@ android { buildTypes { release { minifyEnabled false - proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' } } sourceSets { diff --git a/selectableviews-appcompat/proguard-rules.pro b/selectableviews-appcompat/proguard-rules.pro deleted file mode 100644 index f1b424510..000000000 --- a/selectableviews-appcompat/proguard-rules.pro +++ /dev/null @@ -1,21 +0,0 @@ -# Add project specific ProGuard rules here. -# You can control the set of applied configuration files using the -# proguardFiles setting in build.gradle. -# -# For more details, see -# http://developer.android.com/guide/developing/tools/proguard.html - -# If your project uses WebView with JS, uncomment the following -# and specify the fully qualified class name to the JavaScript interface -# class: -#-keepclassmembers class fqcn.of.javascript.interface.for.webview { -# public *; -#} - -# Uncomment this to preserve the line number information for -# debugging stack traces. -#-keepattributes SourceFile,LineNumberTable - -# If you keep the line number information, uncomment this to -# hide the original source file name. -#-renamesourcefileattribute SourceFile diff --git a/selectableviews-constraintlayout/build.gradle b/selectableviews-constraintlayout/build.gradle index 6019bb3b6..85af75f2b 100644 --- a/selectableviews-constraintlayout/build.gradle +++ b/selectableviews-constraintlayout/build.gradle @@ -30,7 +30,6 @@ android { buildTypes { release { minifyEnabled false - proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' } } sourceSets { diff --git a/selectableviews-constraintlayout/proguard-rules.pro b/selectableviews-constraintlayout/proguard-rules.pro deleted file mode 100644 index f1b424510..000000000 --- a/selectableviews-constraintlayout/proguard-rules.pro +++ /dev/null @@ -1,21 +0,0 @@ -# Add project specific ProGuard rules here. -# You can control the set of applied configuration files using the -# proguardFiles setting in build.gradle. -# -# For more details, see -# http://developer.android.com/guide/developing/tools/proguard.html - -# If your project uses WebView with JS, uncomment the following -# and specify the fully qualified class name to the JavaScript interface -# class: -#-keepclassmembers class fqcn.of.javascript.interface.for.webview { -# public *; -#} - -# Uncomment this to preserve the line number information for -# debugging stack traces. -#-keepattributes SourceFile,LineNumberTable - -# If you keep the line number information, uncomment this to -# hide the original source file name. -#-renamesourcefileattribute SourceFile diff --git a/selectableviews/build.gradle b/selectableviews/build.gradle index 9d05c7923..b7ac6ae83 100644 --- a/selectableviews/build.gradle +++ b/selectableviews/build.gradle @@ -30,7 +30,6 @@ android { buildTypes { release { minifyEnabled false - proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' } } sourceSets { diff --git a/selectableviews/proguard-rules.pro b/selectableviews/proguard-rules.pro deleted file mode 100644 index 872d9c4c4..000000000 --- a/selectableviews/proguard-rules.pro +++ /dev/null @@ -1,17 +0,0 @@ -# Add project specific ProGuard rules here. -# By default, the flags in this file are appended to flags specified -# in /Users/statop/Android/sdk/tools/proguard/proguard-android.txt -# You can edit the include path and order by changing the proguardFiles -# directive in build.gradle. -# -# For more details, see -# http://developer.android.com/guide/developing/tools/proguard.html - -# Add any project specific keep options here: - -# If your project uses WebView with JS, uncomment the following -# and specify the fully qualified class name to the JavaScript interface -# class: -#-keepclassmembers class fqcn.of.javascript.interface.for.webview { -# public *; -#} diff --git a/snackbar/build.gradle b/snackbar/build.gradle index a8d718352..7ec1f20af 100644 --- a/snackbar/build.gradle +++ b/snackbar/build.gradle @@ -33,7 +33,6 @@ android { buildTypes { release { minifyEnabled false - proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' } } } diff --git a/snackbar/proguard-rules.pro b/snackbar/proguard-rules.pro deleted file mode 100644 index f1b424510..000000000 --- a/snackbar/proguard-rules.pro +++ /dev/null @@ -1,21 +0,0 @@ -# Add project specific ProGuard rules here. -# You can control the set of applied configuration files using the -# proguardFiles setting in build.gradle. -# -# For more details, see -# http://developer.android.com/guide/developing/tools/proguard.html - -# If your project uses WebView with JS, uncomment the following -# and specify the fully qualified class name to the JavaScript interface -# class: -#-keepclassmembers class fqcn.of.javascript.interface.for.webview { -# public *; -#} - -# Uncomment this to preserve the line number information for -# debugging stack traces. -#-keepattributes SourceFile,LineNumberTable - -# If you keep the line number information, uncomment this to -# hide the original source file name. -#-renamesourcefileattribute SourceFile diff --git a/stetho-init/build.gradle b/stetho-init/build.gradle index a8f15f0a1..ad1118185 100644 --- a/stetho-init/build.gradle +++ b/stetho-init/build.gradle @@ -30,7 +30,6 @@ android { buildTypes { release { minifyEnabled false - proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' } } sourceSets { diff --git a/stetho-init/proguard-rules.pro b/stetho-init/proguard-rules.pro deleted file mode 100644 index 74d4a458b..000000000 --- a/stetho-init/proguard-rules.pro +++ /dev/null @@ -1,25 +0,0 @@ -# Add project specific ProGuard rules here. -# By default, the flags in this file are appended to flags specified -# in /Users/statop/Android/sdk/tools/proguard/proguard-android.txt -# You can edit the include path and order by changing the proguardFiles -# directive in build.gradle. -# -# For more details, see -# http://developer.android.com/guide/developing/tools/proguard.html - -# Add any project specific keep options here: - -# If your project uses WebView with JS, uncomment the following -# and specify the fully qualified class name to the JavaScript interface -# class: -#-keepclassmembers class fqcn.of.javascript.interface.for.webview { -# public *; -#} - -# Uncomment this to preserve the line number information for -# debugging stack traces. -#-keepattributes SourceFile,LineNumberTable - -# If you keep the line number information, uncomment this to -# hide the original source file name. -#-renamesourcefileattribute SourceFile diff --git a/systemservices/build.gradle b/systemservices/build.gradle index 8fc9d95a0..f802d664e 100644 --- a/systemservices/build.gradle +++ b/systemservices/build.gradle @@ -33,7 +33,6 @@ android { buildTypes { release { minifyEnabled false - proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' } } } diff --git a/systemservices/proguard-rules.pro b/systemservices/proguard-rules.pro deleted file mode 100644 index f1b424510..000000000 --- a/systemservices/proguard-rules.pro +++ /dev/null @@ -1,21 +0,0 @@ -# Add project specific ProGuard rules here. -# You can control the set of applied configuration files using the -# proguardFiles setting in build.gradle. -# -# For more details, see -# http://developer.android.com/guide/developing/tools/proguard.html - -# If your project uses WebView with JS, uncomment the following -# and specify the fully qualified class name to the JavaScript interface -# class: -#-keepclassmembers class fqcn.of.javascript.interface.for.webview { -# public *; -#} - -# Uncomment this to preserve the line number information for -# debugging stack traces. -#-keepattributes SourceFile,LineNumberTable - -# If you keep the line number information, uncomment this to -# hide the original source file name. -#-renamesourcefileattribute SourceFile diff --git a/toast/build.gradle b/toast/build.gradle index 5a69ecb2f..c693b7ac1 100644 --- a/toast/build.gradle +++ b/toast/build.gradle @@ -33,7 +33,6 @@ android { buildTypes { release { minifyEnabled false - proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' } } } diff --git a/toast/proguard-rules.pro b/toast/proguard-rules.pro deleted file mode 100644 index f1b424510..000000000 --- a/toast/proguard-rules.pro +++ /dev/null @@ -1,21 +0,0 @@ -# Add project specific ProGuard rules here. -# You can control the set of applied configuration files using the -# proguardFiles setting in build.gradle. -# -# For more details, see -# http://developer.android.com/guide/developing/tools/proguard.html - -# If your project uses WebView with JS, uncomment the following -# and specify the fully qualified class name to the JavaScript interface -# class: -#-keepclassmembers class fqcn.of.javascript.interface.for.webview { -# public *; -#} - -# Uncomment this to preserve the line number information for -# debugging stack traces. -#-keepattributes SourceFile,LineNumberTable - -# If you keep the line number information, uncomment this to -# hide the original source file name. -#-renamesourcefileattribute SourceFile diff --git a/typesaferecyclerview/build.gradle b/typesaferecyclerview/build.gradle index 2f57bd775..6c4b6aa1d 100644 --- a/typesaferecyclerview/build.gradle +++ b/typesaferecyclerview/build.gradle @@ -31,7 +31,6 @@ android { buildTypes { release { minifyEnabled false - proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' } } sourceSets { diff --git a/typesaferecyclerview/proguard-rules.pro b/typesaferecyclerview/proguard-rules.pro deleted file mode 100644 index 872d9c4c4..000000000 --- a/typesaferecyclerview/proguard-rules.pro +++ /dev/null @@ -1,17 +0,0 @@ -# Add project specific ProGuard rules here. -# By default, the flags in this file are appended to flags specified -# in /Users/statop/Android/sdk/tools/proguard/proguard-android.txt -# You can edit the include path and order by changing the proguardFiles -# directive in build.gradle. -# -# For more details, see -# http://developer.android.com/guide/developing/tools/proguard.html - -# Add any project specific keep options here: - -# If your project uses WebView with JS, uncomment the following -# and specify the fully qualified class name to the JavaScript interface -# class: -#-keepclassmembers class fqcn.of.javascript.interface.for.webview { -# public *; -#} diff --git a/uithread/build.gradle b/uithread/build.gradle index 014b3e668..0ab2fcc46 100644 --- a/uithread/build.gradle +++ b/uithread/build.gradle @@ -33,7 +33,6 @@ android { buildTypes { release { minifyEnabled false - proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' } } } diff --git a/uithread/proguard-rules.pro b/uithread/proguard-rules.pro deleted file mode 100644 index f1b424510..000000000 --- a/uithread/proguard-rules.pro +++ /dev/null @@ -1,21 +0,0 @@ -# Add project specific ProGuard rules here. -# You can control the set of applied configuration files using the -# proguardFiles setting in build.gradle. -# -# For more details, see -# http://developer.android.com/guide/developing/tools/proguard.html - -# If your project uses WebView with JS, uncomment the following -# and specify the fully qualified class name to the JavaScript interface -# class: -#-keepclassmembers class fqcn.of.javascript.interface.for.webview { -# public *; -#} - -# Uncomment this to preserve the line number information for -# debugging stack traces. -#-keepattributes SourceFile,LineNumberTable - -# If you keep the line number information, uncomment this to -# hide the original source file name. -#-renamesourcefileattribute SourceFile diff --git a/viewdsl-appcompat-styles/build.gradle b/viewdsl-appcompat-styles/build.gradle index 53cae6e00..0978c21b8 100644 --- a/viewdsl-appcompat-styles/build.gradle +++ b/viewdsl-appcompat-styles/build.gradle @@ -30,7 +30,6 @@ android { buildTypes { release { minifyEnabled false - proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' } } sourceSets { diff --git a/viewdsl-appcompat-styles/proguard-rules.pro b/viewdsl-appcompat-styles/proguard-rules.pro deleted file mode 100644 index f1b424510..000000000 --- a/viewdsl-appcompat-styles/proguard-rules.pro +++ /dev/null @@ -1,21 +0,0 @@ -# Add project specific ProGuard rules here. -# You can control the set of applied configuration files using the -# proguardFiles setting in build.gradle. -# -# For more details, see -# http://developer.android.com/guide/developing/tools/proguard.html - -# If your project uses WebView with JS, uncomment the following -# and specify the fully qualified class name to the JavaScript interface -# class: -#-keepclassmembers class fqcn.of.javascript.interface.for.webview { -# public *; -#} - -# Uncomment this to preserve the line number information for -# debugging stack traces. -#-keepattributes SourceFile,LineNumberTable - -# If you keep the line number information, uncomment this to -# hide the original source file name. -#-renamesourcefileattribute SourceFile diff --git a/viewdsl-appcompat/build.gradle b/viewdsl-appcompat/build.gradle index b694f1716..4ffa380d3 100644 --- a/viewdsl-appcompat/build.gradle +++ b/viewdsl-appcompat/build.gradle @@ -30,7 +30,6 @@ android { buildTypes { release { minifyEnabled false - proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' } } sourceSets { diff --git a/viewdsl-appcompat/proguard-rules.pro b/viewdsl-appcompat/proguard-rules.pro deleted file mode 100644 index f1b424510..000000000 --- a/viewdsl-appcompat/proguard-rules.pro +++ /dev/null @@ -1,21 +0,0 @@ -# Add project specific ProGuard rules here. -# You can control the set of applied configuration files using the -# proguardFiles setting in build.gradle. -# -# For more details, see -# http://developer.android.com/guide/developing/tools/proguard.html - -# If your project uses WebView with JS, uncomment the following -# and specify the fully qualified class name to the JavaScript interface -# class: -#-keepclassmembers class fqcn.of.javascript.interface.for.webview { -# public *; -#} - -# Uncomment this to preserve the line number information for -# debugging stack traces. -#-keepattributes SourceFile,LineNumberTable - -# If you keep the line number information, uncomment this to -# hide the original source file name. -#-renamesourcefileattribute SourceFile diff --git a/viewdsl-constraintlayout/build.gradle b/viewdsl-constraintlayout/build.gradle index bf07bc8df..b037e1483 100644 --- a/viewdsl-constraintlayout/build.gradle +++ b/viewdsl-constraintlayout/build.gradle @@ -30,7 +30,6 @@ android { buildTypes { release { minifyEnabled false - proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' } } sourceSets { diff --git a/viewdsl-constraintlayout/proguard-rules.pro b/viewdsl-constraintlayout/proguard-rules.pro deleted file mode 100644 index f1b424510..000000000 --- a/viewdsl-constraintlayout/proguard-rules.pro +++ /dev/null @@ -1,21 +0,0 @@ -# Add project specific ProGuard rules here. -# You can control the set of applied configuration files using the -# proguardFiles setting in build.gradle. -# -# For more details, see -# http://developer.android.com/guide/developing/tools/proguard.html - -# If your project uses WebView with JS, uncomment the following -# and specify the fully qualified class name to the JavaScript interface -# class: -#-keepclassmembers class fqcn.of.javascript.interface.for.webview { -# public *; -#} - -# Uncomment this to preserve the line number information for -# debugging stack traces. -#-keepattributes SourceFile,LineNumberTable - -# If you keep the line number information, uncomment this to -# hide the original source file name. -#-renamesourcefileattribute SourceFile diff --git a/viewdsl-design/build.gradle b/viewdsl-design/build.gradle index 71cda5977..c96db03aa 100644 --- a/viewdsl-design/build.gradle +++ b/viewdsl-design/build.gradle @@ -30,7 +30,6 @@ android { buildTypes { release { minifyEnabled false - proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' } } sourceSets { diff --git a/viewdsl-design/proguard-rules.pro b/viewdsl-design/proguard-rules.pro deleted file mode 100644 index f1b424510..000000000 --- a/viewdsl-design/proguard-rules.pro +++ /dev/null @@ -1,21 +0,0 @@ -# Add project specific ProGuard rules here. -# You can control the set of applied configuration files using the -# proguardFiles setting in build.gradle. -# -# For more details, see -# http://developer.android.com/guide/developing/tools/proguard.html - -# If your project uses WebView with JS, uncomment the following -# and specify the fully qualified class name to the JavaScript interface -# class: -#-keepclassmembers class fqcn.of.javascript.interface.for.webview { -# public *; -#} - -# Uncomment this to preserve the line number information for -# debugging stack traces. -#-keepattributes SourceFile,LineNumberTable - -# If you keep the line number information, uncomment this to -# hide the original source file name. -#-renamesourcefileattribute SourceFile diff --git a/viewdsl-ide-preview/build.gradle b/viewdsl-ide-preview/build.gradle index dac9d06f0..8b6c2ef3b 100644 --- a/viewdsl-ide-preview/build.gradle +++ b/viewdsl-ide-preview/build.gradle @@ -30,7 +30,6 @@ android { buildTypes { release { minifyEnabled false - proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' } } sourceSets { diff --git a/viewdsl-ide-preview/proguard-rules.pro b/viewdsl-ide-preview/proguard-rules.pro deleted file mode 100644 index f1b424510..000000000 --- a/viewdsl-ide-preview/proguard-rules.pro +++ /dev/null @@ -1,21 +0,0 @@ -# Add project specific ProGuard rules here. -# You can control the set of applied configuration files using the -# proguardFiles setting in build.gradle. -# -# For more details, see -# http://developer.android.com/guide/developing/tools/proguard.html - -# If your project uses WebView with JS, uncomment the following -# and specify the fully qualified class name to the JavaScript interface -# class: -#-keepclassmembers class fqcn.of.javascript.interface.for.webview { -# public *; -#} - -# Uncomment this to preserve the line number information for -# debugging stack traces. -#-keepattributes SourceFile,LineNumberTable - -# If you keep the line number information, uncomment this to -# hide the original source file name. -#-renamesourcefileattribute SourceFile diff --git a/viewdsl-recyclerview/build.gradle b/viewdsl-recyclerview/build.gradle index 19f89acf9..e10c4cf4e 100644 --- a/viewdsl-recyclerview/build.gradle +++ b/viewdsl-recyclerview/build.gradle @@ -30,7 +30,6 @@ android { buildTypes { release { minifyEnabled false - proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' } } sourceSets { diff --git a/viewdsl-recyclerview/proguard-rules.pro b/viewdsl-recyclerview/proguard-rules.pro deleted file mode 100644 index f1b424510..000000000 --- a/viewdsl-recyclerview/proguard-rules.pro +++ /dev/null @@ -1,21 +0,0 @@ -# Add project specific ProGuard rules here. -# You can control the set of applied configuration files using the -# proguardFiles setting in build.gradle. -# -# For more details, see -# http://developer.android.com/guide/developing/tools/proguard.html - -# If your project uses WebView with JS, uncomment the following -# and specify the fully qualified class name to the JavaScript interface -# class: -#-keepclassmembers class fqcn.of.javascript.interface.for.webview { -# public *; -#} - -# Uncomment this to preserve the line number information for -# debugging stack traces. -#-keepattributes SourceFile,LineNumberTable - -# If you keep the line number information, uncomment this to -# hide the original source file name. -#-renamesourcefileattribute SourceFile diff --git a/viewdsl/build.gradle b/viewdsl/build.gradle index 7f9ba3a51..cf3d4ee50 100644 --- a/viewdsl/build.gradle +++ b/viewdsl/build.gradle @@ -30,7 +30,6 @@ android { buildTypes { release { minifyEnabled false - proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' } } sourceSets { diff --git a/viewdsl/proguard-rules.pro b/viewdsl/proguard-rules.pro deleted file mode 100644 index f1b424510..000000000 --- a/viewdsl/proguard-rules.pro +++ /dev/null @@ -1,21 +0,0 @@ -# Add project specific ProGuard rules here. -# You can control the set of applied configuration files using the -# proguardFiles setting in build.gradle. -# -# For more details, see -# http://developer.android.com/guide/developing/tools/proguard.html - -# If your project uses WebView with JS, uncomment the following -# and specify the fully qualified class name to the JavaScript interface -# class: -#-keepclassmembers class fqcn.of.javascript.interface.for.webview { -# public *; -#} - -# Uncomment this to preserve the line number information for -# debugging stack traces. -#-keepattributes SourceFile,LineNumberTable - -# If you keep the line number information, uncomment this to -# hide the original source file name. -#-renamesourcefileattribute SourceFile diff --git a/views-appcompat/build.gradle b/views-appcompat/build.gradle index 7d123a735..4f338416d 100644 --- a/views-appcompat/build.gradle +++ b/views-appcompat/build.gradle @@ -30,7 +30,6 @@ android { buildTypes { release { minifyEnabled false - proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' } } sourceSets { diff --git a/views-appcompat/proguard-rules.pro b/views-appcompat/proguard-rules.pro deleted file mode 100644 index f1b424510..000000000 --- a/views-appcompat/proguard-rules.pro +++ /dev/null @@ -1,21 +0,0 @@ -# Add project specific ProGuard rules here. -# You can control the set of applied configuration files using the -# proguardFiles setting in build.gradle. -# -# For more details, see -# http://developer.android.com/guide/developing/tools/proguard.html - -# If your project uses WebView with JS, uncomment the following -# and specify the fully qualified class name to the JavaScript interface -# class: -#-keepclassmembers class fqcn.of.javascript.interface.for.webview { -# public *; -#} - -# Uncomment this to preserve the line number information for -# debugging stack traces. -#-keepattributes SourceFile,LineNumberTable - -# If you keep the line number information, uncomment this to -# hide the original source file name. -#-renamesourcefileattribute SourceFile diff --git a/views-cardview/build.gradle b/views-cardview/build.gradle index c8efb1d07..3990989d3 100644 --- a/views-cardview/build.gradle +++ b/views-cardview/build.gradle @@ -30,7 +30,6 @@ android { buildTypes { release { minifyEnabled false - proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' } } sourceSets { diff --git a/views-cardview/proguard-rules.pro b/views-cardview/proguard-rules.pro deleted file mode 100644 index f1b424510..000000000 --- a/views-cardview/proguard-rules.pro +++ /dev/null @@ -1,21 +0,0 @@ -# Add project specific ProGuard rules here. -# You can control the set of applied configuration files using the -# proguardFiles setting in build.gradle. -# -# For more details, see -# http://developer.android.com/guide/developing/tools/proguard.html - -# If your project uses WebView with JS, uncomment the following -# and specify the fully qualified class name to the JavaScript interface -# class: -#-keepclassmembers class fqcn.of.javascript.interface.for.webview { -# public *; -#} - -# Uncomment this to preserve the line number information for -# debugging stack traces. -#-keepattributes SourceFile,LineNumberTable - -# If you keep the line number information, uncomment this to -# hide the original source file name. -#-renamesourcefileattribute SourceFile diff --git a/views-design/build.gradle b/views-design/build.gradle index 953655847..6f0875ab7 100644 --- a/views-design/build.gradle +++ b/views-design/build.gradle @@ -30,7 +30,6 @@ android { buildTypes { release { minifyEnabled false - proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' } } sourceSets { diff --git a/views-design/proguard-rules.pro b/views-design/proguard-rules.pro deleted file mode 100644 index f1b424510..000000000 --- a/views-design/proguard-rules.pro +++ /dev/null @@ -1,21 +0,0 @@ -# Add project specific ProGuard rules here. -# You can control the set of applied configuration files using the -# proguardFiles setting in build.gradle. -# -# For more details, see -# http://developer.android.com/guide/developing/tools/proguard.html - -# If your project uses WebView with JS, uncomment the following -# and specify the fully qualified class name to the JavaScript interface -# class: -#-keepclassmembers class fqcn.of.javascript.interface.for.webview { -# public *; -#} - -# Uncomment this to preserve the line number information for -# debugging stack traces. -#-keepattributes SourceFile,LineNumberTable - -# If you keep the line number information, uncomment this to -# hide the original source file name. -#-renamesourcefileattribute SourceFile diff --git a/views-recyclerview/build.gradle b/views-recyclerview/build.gradle index 556307b70..6acac1028 100644 --- a/views-recyclerview/build.gradle +++ b/views-recyclerview/build.gradle @@ -30,7 +30,6 @@ android { buildTypes { release { minifyEnabled false - proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' } } sourceSets { diff --git a/views-recyclerview/proguard-rules.pro b/views-recyclerview/proguard-rules.pro deleted file mode 100644 index f1b424510..000000000 --- a/views-recyclerview/proguard-rules.pro +++ /dev/null @@ -1,21 +0,0 @@ -# Add project specific ProGuard rules here. -# You can control the set of applied configuration files using the -# proguardFiles setting in build.gradle. -# -# For more details, see -# http://developer.android.com/guide/developing/tools/proguard.html - -# If your project uses WebView with JS, uncomment the following -# and specify the fully qualified class name to the JavaScript interface -# class: -#-keepclassmembers class fqcn.of.javascript.interface.for.webview { -# public *; -#} - -# Uncomment this to preserve the line number information for -# debugging stack traces. -#-keepattributes SourceFile,LineNumberTable - -# If you keep the line number information, uncomment this to -# hide the original source file name. -#-renamesourcefileattribute SourceFile diff --git a/views/build.gradle b/views/build.gradle index 5b0b1d1b5..eda7a8d2f 100644 --- a/views/build.gradle +++ b/views/build.gradle @@ -30,7 +30,6 @@ android { buildTypes { release { minifyEnabled false - proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' } } sourceSets { diff --git a/views/proguard-rules.pro b/views/proguard-rules.pro deleted file mode 100644 index f1b424510..000000000 --- a/views/proguard-rules.pro +++ /dev/null @@ -1,21 +0,0 @@ -# Add project specific ProGuard rules here. -# You can control the set of applied configuration files using the -# proguardFiles setting in build.gradle. -# -# For more details, see -# http://developer.android.com/guide/developing/tools/proguard.html - -# If your project uses WebView with JS, uncomment the following -# and specify the fully qualified class name to the JavaScript interface -# class: -#-keepclassmembers class fqcn.of.javascript.interface.for.webview { -# public *; -#} - -# Uncomment this to preserve the line number information for -# debugging stack traces. -#-keepattributes SourceFile,LineNumberTable - -# If you keep the line number information, uncomment this to -# hide the original source file name. -#-renamesourcefileattribute SourceFile From e4148e0e7261c7aa02fd446ac9a38ecfe88de854 Mon Sep 17 00:00:00 2001 From: Louis CAD Date: Sun, 8 Jul 2018 20:14:07 +0200 Subject: [PATCH 006/167] Remove unneeded explicit type parameter (cherry picked from commit b0d3ffe) --- .../src/main/java/splitties/checkedlazy/CheckedLazy.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/checkedlazy/src/main/java/splitties/checkedlazy/CheckedLazy.kt b/checkedlazy/src/main/java/splitties/checkedlazy/CheckedLazy.kt index 733c87ec4..47c8770f3 100644 --- a/checkedlazy/src/main/java/splitties/checkedlazy/CheckedLazy.kt +++ b/checkedlazy/src/main/java/splitties/checkedlazy/CheckedLazy.kt @@ -21,7 +21,7 @@ package splitties.checkedlazy /** * Returns a lazy that throws an [IllegalStateException] if its value is accessed outside of UI thread. */ -fun uiLazy(initializer: () -> T): Lazy = CheckedAccessLazyImpl(initializer, uiChecker) +fun uiLazy(initializer: () -> T): Lazy = CheckedAccessLazyImpl(initializer, uiChecker) /** * Creates a new instance of the [Lazy] that uses the specified initialization @@ -41,7 +41,7 @@ fun uiLazy(initializer: () -> T): Lazy = CheckedAccessLazyImpl(initial * @param readChecker This method may check any condition external to this [Lazy]. */ fun checkedLazy(readChecker: () -> Unit, initializer: () -> T): Lazy { - return CheckedAccessLazyImpl(initializer, readChecker) + return CheckedAccessLazyImpl(initializer, readChecker) } /** From e8989fddd914be0f341da25749c55be5a80298ae Mon Sep 17 00:00:00 2001 From: Louis CAD Date: Sun, 8 Jul 2018 20:14:46 +0200 Subject: [PATCH 007/167] Move lambda arguments out of parentheses (cherry picked from commit 748bef2) --- .../main/java/splitties/arch/lifecycle/LiveData.kt | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/arch-lifecycle/src/main/java/splitties/arch/lifecycle/LiveData.kt b/arch-lifecycle/src/main/java/splitties/arch/lifecycle/LiveData.kt index a685213aa..219da58bc 100644 --- a/arch-lifecycle/src/main/java/splitties/arch/lifecycle/LiveData.kt +++ b/arch-lifecycle/src/main/java/splitties/arch/lifecycle/LiveData.kt @@ -56,20 +56,20 @@ inline fun LifecycleOwner.observeNotNull( */ inline fun LiveData.map( crossinline transform: (X?) -> Y -): LiveData = Transformations.map(this, { input -> transform(input) }) +): LiveData = Transformations.map(this) { input -> transform(input) } inline fun LiveData.mapNotNull( crossinline transform: (X) -> Y -): LiveData = Transformations.map(this, { input: X? -> +): LiveData = Transformations.map(this) { input: X? -> input?.let { transform(it) } -}) +} inline fun LiveData.switchMap( crossinline transform: (X?) -> LiveData? -): LiveData = Transformations.switchMap(this, { input -> transform(input) }) +): LiveData = Transformations.switchMap(this) { input -> transform(input) } inline fun LiveData.switchMapNotNull( crossinline transform: (X) -> LiveData? -): LiveData = Transformations.switchMap(this, { input: X? -> +): LiveData = Transformations.switchMap(this) { input: X? -> input?.let { transform(it) } -}) +} From 2297ca7f1af58a1dfc64173ef46890f8c9533d6d Mon Sep 17 00:00:00 2001 From: Louis CAD Date: Sun, 8 Jul 2018 20:21:32 +0200 Subject: [PATCH 008/167] Suppress unneeded warning (cherry picked from commit 1e400c9) --- resources/src/main/java/splitties/resources/StyledAttributes.kt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/resources/src/main/java/splitties/resources/StyledAttributes.kt b/resources/src/main/java/splitties/resources/StyledAttributes.kt index 17bf0ca00..af6730542 100644 --- a/resources/src/main/java/splitties/resources/StyledAttributes.kt +++ b/resources/src/main/java/splitties/resources/StyledAttributes.kt @@ -18,6 +18,7 @@ package splitties.resources +import android.annotation.SuppressLint import android.content.Context import android.content.res.TypedArray import android.support.annotation.AttrRes @@ -34,6 +35,7 @@ inline fun Context.withStyledAttributes( } @PublishedApi +@SuppressLint("Recycle") // Recycled in function above. internal fun Context.obtainStyledAttr(@AttrRes attrRes: Int): TypedArray = if (isUiThread) { uiThreadConfinedCachedAttrArray[0] = attrRes obtainStyledAttributes(uiThreadConfinedCachedAttrArray) From ec7084f52b2ee40d943dd5bbf44537514b54b60d Mon Sep 17 00:00:00 2001 From: Louis CAD Date: Wed, 8 Aug 2018 22:44:52 +0200 Subject: [PATCH 009/167] kotlinx.coroutines 0.24.0 --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 9cf2846a6..735e664fc 100644 --- a/build.gradle +++ b/build.gradle @@ -55,7 +55,7 @@ allprojects { arch_room_version = '1.0.0' constraintLayout_version = '1.1.0' timber_version = '4.7.1' - kotlinxCoroutines_version = '0.23.4' + kotlinxCoroutines_version = '0.24.0' } } From a056a3f98d34500e0bdaf96511341c64b8a6d01e Mon Sep 17 00:00:00 2001 From: Louis CAD Date: Wed, 8 Aug 2018 23:28:07 +0200 Subject: [PATCH 010/167] Rename private field edit to isEditing This will avoid pre auto-import clashes with the edit extension function. Closes #96 --- .../src/main/java/splitties/preferences/Preferences.kt | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/preferences/src/main/java/splitties/preferences/Preferences.kt b/preferences/src/main/java/splitties/preferences/Preferences.kt index e5784aaa6..c784fe601 100644 --- a/preferences/src/main/java/splitties/preferences/Preferences.kt +++ b/preferences/src/main/java/splitties/preferences/Preferences.kt @@ -70,27 +70,27 @@ abstract class Preferences(name: String, protected fun stringSetOrNullPref(defaultValue: Set? = null) = StringSetOrNullPref(key = PROP_NAME, defaultValue = defaultValue) - private var edit = false + private var isEditing = false private var useCommit = false private var useCommitForEdit = false fun beginEdit(blocking: Boolean = false) { useCommitForEdit = blocking - edit = true + isEditing = true } fun endEdit() { if (useCommitForEdit) editor.commit() else editor.apply() - edit = false + isEditing = false } fun abortEdit() { editor = editor // Invalidates the editor stored in the delegate - edit = false + isEditing = false } private fun SharedPreferences.Editor.attemptApply() { - if (edit) return + if (isEditing) return if (useCommit) commit() else apply() } From efa0da7e22ef34fdfb9b2160db55ae64bf787f65 Mon Sep 17 00:00:00 2001 From: Louis CAD Date: Thu, 9 Aug 2018 00:15:20 +0200 Subject: [PATCH 011/167] Add consumer proguard rules for compileOnly deps Closes #106 --- intents/build.gradle | 1 + intents/proguard-rules.pro | 12 ++++++++++++ .../intents/IntentSpecFragmentExtensions.kt | 2 +- preferences/build.gradle | 1 + preferences/proguard-rules.pro | 12 ++++++++++++ resources/build.gradle | 1 + resources/proguard-rules.pro | 12 ++++++++++++ toast/build.gradle | 1 + toast/proguard-rules.pro | 12 ++++++++++++ 9 files changed, 53 insertions(+), 1 deletion(-) create mode 100644 intents/proguard-rules.pro create mode 100644 preferences/proguard-rules.pro create mode 100644 resources/proguard-rules.pro create mode 100644 toast/proguard-rules.pro diff --git a/intents/build.gradle b/intents/build.gradle index 7cd30fb76..8c317df5a 100644 --- a/intents/build.gradle +++ b/intents/build.gradle @@ -30,6 +30,7 @@ android { buildTypes { release { minifyEnabled false + consumerProguardFiles "proguard-rules.pro" } } sourceSets { diff --git a/intents/proguard-rules.pro b/intents/proguard-rules.pro new file mode 100644 index 000000000..d6b7ea2b7 --- /dev/null +++ b/intents/proguard-rules.pro @@ -0,0 +1,12 @@ +# Add project specific ProGuard rules here. +# By default, the flags in this file are appended to flags specified +# in ~/Android/sdk/tools/proguard/proguard-android.txt +# You can edit the include path and order by changing the proguardFiles +# directive in build.gradle. +# +# For more details, see +# http://developer.android.com/guide/developing/tools/proguard.html + +# Add any project specific keep options here: + +-dontwarn splitties.intents.IntentSpecFragmentExtensionsKt diff --git a/intents/src/main/java/splitties/intents/IntentSpecFragmentExtensions.kt b/intents/src/main/java/splitties/intents/IntentSpecFragmentExtensions.kt index f543b2d85..a8cee526c 100644 --- a/intents/src/main/java/splitties/intents/IntentSpecFragmentExtensions.kt +++ b/intents/src/main/java/splitties/intents/IntentSpecFragmentExtensions.kt @@ -20,7 +20,7 @@ import android.support.v4.app.Fragment import splitties.bundle.BundleSpec import splitties.exceptions.unsupported -// Activity +// WARNING. If this file is renamed, edit the proguard-rules.pro file accordingly. @JvmName("new") @Suppress("DeprecatedCallableAddReplaceWith", "unused") diff --git a/preferences/build.gradle b/preferences/build.gradle index 689616f19..d0d762bcd 100644 --- a/preferences/build.gradle +++ b/preferences/build.gradle @@ -33,6 +33,7 @@ android { buildTypes { release { minifyEnabled false + consumerProguardFiles "proguard-rules.pro" } } } diff --git a/preferences/proguard-rules.pro b/preferences/proguard-rules.pro new file mode 100644 index 000000000..770f78815 --- /dev/null +++ b/preferences/proguard-rules.pro @@ -0,0 +1,12 @@ +# Add project specific ProGuard rules here. +# By default, the flags in this file are appended to flags specified +# in ~/Android/sdk/tools/proguard/proguard-android.txt +# You can edit the include path and order by changing the proguardFiles +# directive in build.gradle. +# +# For more details, see +# http://developer.android.com/guide/developing/tools/proguard.html + +# Add any project specific keep options here: + +-dontwarn splitties.preferences.experimental.** diff --git a/resources/build.gradle b/resources/build.gradle index 057270d3d..89a895113 100644 --- a/resources/build.gradle +++ b/resources/build.gradle @@ -33,6 +33,7 @@ android { buildTypes { release { minifyEnabled false + consumerProguardFiles "proguard-rules.pro" } } } diff --git a/resources/proguard-rules.pro b/resources/proguard-rules.pro new file mode 100644 index 000000000..ba4ad2d5e --- /dev/null +++ b/resources/proguard-rules.pro @@ -0,0 +1,12 @@ +# Add project specific ProGuard rules here. +# By default, the flags in this file are appended to flags specified +# in ~/Android/sdk/tools/proguard/proguard-android.txt +# You can edit the include path and order by changing the proguardFiles +# directive in build.gradle. +# +# For more details, see +# http://developer.android.com/guide/developing/tools/proguard.html + +# Add any project specific keep options here: + +-dontwarn splitties.resources.** diff --git a/toast/build.gradle b/toast/build.gradle index c693b7ac1..ed93e707a 100644 --- a/toast/build.gradle +++ b/toast/build.gradle @@ -33,6 +33,7 @@ android { buildTypes { release { minifyEnabled false + consumerProguardFiles "proguard-rules.pro" } } } diff --git a/toast/proguard-rules.pro b/toast/proguard-rules.pro new file mode 100644 index 000000000..10b279d6e --- /dev/null +++ b/toast/proguard-rules.pro @@ -0,0 +1,12 @@ +# Add project specific ProGuard rules here. +# By default, the flags in this file are appended to flags specified +# in ~/Android/sdk/tools/proguard/proguard-android.txt +# You can edit the include path and order by changing the proguardFiles +# directive in build.gradle. +# +# For more details, see +# http://developer.android.com/guide/developing/tools/proguard.html + +# Add any project specific keep options here: + +-dontwarn splitties.toast.ToastKt From 04f62c6621dec9c5b4924d473a6fc051a56d4f9b Mon Sep 17 00:00:00 2001 From: Louis CAD Date: Thu, 9 Aug 2018 00:20:20 +0200 Subject: [PATCH 012/167] Add TextView.lines extension property Closes #105 --- views/src/main/java/splitties/views/TextView.kt | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/views/src/main/java/splitties/views/TextView.kt b/views/src/main/java/splitties/views/TextView.kt index f4d021f83..fed3b1a11 100644 --- a/views/src/main/java/splitties/views/TextView.kt +++ b/views/src/main/java/splitties/views/TextView.kt @@ -44,6 +44,10 @@ var TextView.textAppearance: Int set(@StyleRes value) = if (SDK_INT < M) setTextAppearance(context, value) else setTextAppearance(value) +inline var TextView.lines: Int + @Deprecated(NO_GETTER, level = HIDDEN) get() = noGetter + set(value) = setLines(value) + fun TextView.centerText() { if (SDK_INT >= JELLY_BEAN_MR1) textAlignment = View.TEXT_ALIGNMENT_CENTER gravity = Gravity.CENTER From 95e02702cb73e35ee022587a98c542bea1ea983d Mon Sep 17 00:00:00 2001 From: Louis CAD Date: Thu, 9 Aug 2018 01:34:29 +0200 Subject: [PATCH 013/167] Deprecate View visibility extensions Extensions from AndroidX core KTX should be used instead. Closes #104 --- sample/build.gradle | 3 +++ views/src/main/java/splitties/views/Visibility.kt | 8 ++++++++ 2 files changed, 11 insertions(+) diff --git a/sample/build.gradle b/sample/build.gradle index 31772db12..326bab065 100644 --- a/sample/build.gradle +++ b/sample/build.gradle @@ -89,6 +89,9 @@ dependencies { implementation "com.android.support:appcompat-v7:$supportLibs_version" implementation "com.android.support:design:$supportLibs_version" + // Android KTX + implementation "androidx.core:core-ktx:0.3" + // Constraint Layout implementation "com.android.support.constraint:constraint-layout:$constraintLayout_version" diff --git a/views/src/main/java/splitties/views/Visibility.kt b/views/src/main/java/splitties/views/Visibility.kt index 2528b830d..35e4873c6 100644 --- a/views/src/main/java/splitties/views/Visibility.kt +++ b/views/src/main/java/splitties/views/Visibility.kt @@ -25,7 +25,11 @@ import android.view.View * See [showIf] and [gone] if you want to have [View.GONE] instead. */ inline var View.visible: Boolean + //@Deprecated("Use AndroidX KTX extensions", ReplaceWith("isVisible", "androidx.core.view.isVisible")) + //TODO: Uncomment line above when https://youtrack.jetbrains.com/issue/KT-25990 is fixed. + @Deprecated("Replace it by isVisible from AndroidX core KTX 0.3") get() = visibility == View.VISIBLE + @Deprecated("Replace it by isInvisible = !value from AndroidX core KTX 0.3") set(value) { visibility = if (value) View.VISIBLE else View.INVISIBLE } @@ -38,6 +42,7 @@ inline var View.visible: Boolean * @see showIf * @see visible */ +@Deprecated("Use AndroidX core KTX 0.3 extensions", ReplaceWith("isGone", "androidx.core.view.isGone")) inline var View.gone: Boolean get() = visibility == View.GONE set(value) { @@ -51,6 +56,9 @@ inline var View.gone: Boolean * @see gone */ @Suppress("NOTHING_TO_INLINE") +//@Deprecated("Use AndroidX KTX extensions", ReplaceWith("isVisible = condition", "androidx.core.view.isVisible")) +//TODO: Uncomment line above and remove line below when https://youtrack.jetbrains.com/issue/KT-25991 is fixed. +@Deprecated("Replace it by isVisible from AndroidX core KTX 0.3") inline fun View.showIf(condition: Boolean) { visibility = if (condition) View.VISIBLE else View.GONE } From 0203c1fd1c25a9e26a1f43e77a005346b9193ddd Mon Sep 17 00:00:00 2001 From: Louis CAD Date: Thu, 9 Aug 2018 23:07:43 +0200 Subject: [PATCH 014/167] Deprecate & substitute RecyclerView.setSingleView The new View.wrapInRecyclerView method should be used instead because it is compatible with both vertical and horizontal, is safer (no way to try to add/overwrite multiple views), and more concise (saves an indentation level). --- .../louiscad/splittiessample/main/MainUi.kt | 33 +++++++++---------- .../recyclerview/experimental/RecyclerView.kt | 3 +- .../experimental/SingleViewAdapter.kt | 6 ++-- .../experimental/SrollWrapping.kt | 30 +++++++++++++++++ 4 files changed, 51 insertions(+), 21 deletions(-) create mode 100644 viewdsl-recyclerview/src/main/java/splitties/viewdsl/recyclerview/experimental/SrollWrapping.kt diff --git a/sample/src/main/java/com/louiscad/splittiessample/main/MainUi.kt b/sample/src/main/java/com/louiscad/splittiessample/main/MainUi.kt index ede3bdcaf..2e4a793ac 100644 --- a/sample/src/main/java/com/louiscad/splittiessample/main/MainUi.kt +++ b/sample/src/main/java/com/louiscad/splittiessample/main/MainUi.kt @@ -45,8 +45,7 @@ import splitties.viewdsl.design.actionBarLParams import splitties.viewdsl.design.appBarLParams import splitties.viewdsl.design.contentScrollingWithAppBarLParams import splitties.viewdsl.design.defaultLParams -import splitties.viewdsl.recyclerview.experimental.setSingleView -import splitties.viewdsl.recyclerview.recyclerView +import splitties.viewdsl.recyclerview.experimental.wrapInRecyclerView import splitties.views.appcompat.Toolbar import splitties.views.design.contentScrimColor import splitties.views.gravityCenterHorizontal @@ -69,23 +68,21 @@ class MainUi(override val ctx: Context) : Ui { val fab = v(::FloatingActionButton) { imageResource = R.drawable.ic_favorite_white_24dp } - val content = v(::recyclerView) { - setSingleView(v(::verticalLayout) { - add(launchDemoBtn, lParams { - gravity = gravityCenterHorizontal - topMargin = dip(8) - }) - add(toggleNightModeBtn, lParams { - gravity = gravityCenterHorizontal - bottomMargin = dip(8) - }) - add(v(::textView) { - textResource = R.string.large_text - }, lParams { - margin = dimenPxSize(R.dimen.text_margin) - }) + val content = v(::verticalLayout) { + add(launchDemoBtn, lParams { + gravity = gravityCenterHorizontal + topMargin = dip(8) }) - } + add(toggleNightModeBtn, lParams { + gravity = gravityCenterHorizontal + bottomMargin = dip(8) + }) + add(v(::textView) { + textResource = R.string.large_text + }, lParams { + margin = dimenPxSize(R.dimen.text_margin) + }) + }.wrapInRecyclerView() override val root = v(::CoordinatorLayout) { fitsSystemWindows = true add(v(::AppBarLayout, R.id.app_bar, R.style.AppTheme_AppBarOverlay) { diff --git a/viewdsl-recyclerview/src/main/java/splitties/viewdsl/recyclerview/experimental/RecyclerView.kt b/viewdsl-recyclerview/src/main/java/splitties/viewdsl/recyclerview/experimental/RecyclerView.kt index f40a01267..48a83129d 100644 --- a/viewdsl-recyclerview/src/main/java/splitties/viewdsl/recyclerview/experimental/RecyclerView.kt +++ b/viewdsl-recyclerview/src/main/java/splitties/viewdsl/recyclerview/experimental/RecyclerView.kt @@ -18,8 +18,9 @@ package splitties.viewdsl.recyclerview.experimental import android.support.v7.widget.RecyclerView import android.view.View +@Deprecated("Remove explicit RecyclerView and use wrapInRecyclerView(…) instead.") fun RecyclerView.setSingleView(view: View) { - val contentAdapter = SingleViewAdapter(view) + val contentAdapter = SingleViewAdapter(view, vertical = true) layoutManager = contentAdapter.layoutManager adapter = contentAdapter } diff --git a/viewdsl-recyclerview/src/main/java/splitties/viewdsl/recyclerview/experimental/SingleViewAdapter.kt b/viewdsl-recyclerview/src/main/java/splitties/viewdsl/recyclerview/experimental/SingleViewAdapter.kt index 4eec72792..ecacfd624 100644 --- a/viewdsl-recyclerview/src/main/java/splitties/viewdsl/recyclerview/experimental/SingleViewAdapter.kt +++ b/viewdsl-recyclerview/src/main/java/splitties/viewdsl/recyclerview/experimental/SingleViewAdapter.kt @@ -19,13 +19,15 @@ import android.support.v7.widget.RecyclerView import android.view.View import android.view.ViewGroup import splitties.viewdsl.recyclerview.verticalListLayoutParams +import splitties.views.recyclerview.horizontalLayoutManager import splitties.views.recyclerview.verticalLayoutManager internal class SingleViewAdapter( - private val view: V + private val view: V, + vertical: Boolean ) : RecyclerView.Adapter() { - val layoutManager: RecyclerView.LayoutManager = verticalLayoutManager() + val layoutManager = if (vertical) verticalLayoutManager() else horizontalLayoutManager() override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = view.apply { layoutParams = layoutManager.verticalListLayoutParams() diff --git a/viewdsl-recyclerview/src/main/java/splitties/viewdsl/recyclerview/experimental/SrollWrapping.kt b/viewdsl-recyclerview/src/main/java/splitties/viewdsl/recyclerview/experimental/SrollWrapping.kt new file mode 100644 index 000000000..51592b603 --- /dev/null +++ b/viewdsl-recyclerview/src/main/java/splitties/viewdsl/recyclerview/experimental/SrollWrapping.kt @@ -0,0 +1,30 @@ +/* + * Copyright (c) 2018. Louis Cognault Ayeva Derman + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package splitties.viewdsl.recyclerview.experimental + +import android.support.annotation.IdRes +import android.view.View +import splitties.viewdsl.core.v +import splitties.viewdsl.recyclerview.recyclerView + +fun View.wrapInRecyclerView( + horizontal: Boolean = false, + @IdRes id: Int = View.NO_ID +) = v(::recyclerView, id) { + val contentAdapter = SingleViewAdapter(this@wrapInRecyclerView, vertical = !horizontal) + layoutManager = contentAdapter.layoutManager + adapter = contentAdapter +} From bd5b8cbda4d503a4314001336682dbb68e372ba3 Mon Sep 17 00:00:00 2001 From: Louis CAD Date: Fri, 10 Aug 2018 01:10:45 +0200 Subject: [PATCH 015/167] Add reverse no Iterator List forEach extensions --- .../main/java/splitties/collections/Lists.kt | 35 +++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/collections/src/main/java/splitties/collections/Lists.kt b/collections/src/main/java/splitties/collections/Lists.kt index 2d00c4537..69af76bdd 100644 --- a/collections/src/main/java/splitties/collections/Lists.kt +++ b/collections/src/main/java/splitties/collections/Lists.kt @@ -50,3 +50,38 @@ inline fun List.forEachWithIndex(action: (Int, T) -> Unit) { action(i, get(i)) } } + +/** + * Iterates the receiver [List] using an index instead of an [Iterator] like [forEach] would do, but + * in reverse order (from last index down to zero). + * Using this function saves an [Iterator] allocation, which is good for immutable lists or usages + * confined to a single thread like UI thread only use. + * However, this method will not detect concurrent modification, except if the size of the list + * changes on an iteration as a result, which may lead to unpredictable behavior. + * + * @param action the action to invoke on each list element. + */ +inline fun List.forEachReversedByIndex(action: (T) -> Unit) { + val initialSize = size + for (i in lastIndex downTo 0) { + if (size != initialSize) throw ConcurrentModificationException() + action(get(i)) + } +} + +/** + * Iterates the receiver [List] using an index instead of an [Iterator] like [forEachIndexed] would + * do, but in reverse order (from last index down to zero). Using this function saves an [Iterator] + * allocation, which is good for immutable lists or usages confined to a single thread like + * UI thread only use. However, this method will not detect concurrent modification, except if the + * size of the list changes on an iteration as a result, which may lead to unpredictable behavior. + * + * @param action the action to invoke on each list element. + */ +inline fun List.forEachReversedWithIndex(action: (Int, T) -> Unit) { + val initialSize = size + for (i in lastIndex downTo 0) { + if (size != initialSize) throw ConcurrentModificationException() + action(i, get(i)) + } +} From a8e0d3c38dc038058b614ef4dfea12ef8d9ac881 Mon Sep 17 00:00:00 2001 From: Louis CAD Date: Fri, 10 Aug 2018 03:06:26 +0200 Subject: [PATCH 016/167] [WIP] Add experimental generic View DSL --- .../splittiessample/main/MainActivity.kt | 9 +++ .../louiscad/splittiessample/main/MainUi.kt | 9 +-- .../experimental/AppCompatViewFactory.kt | 68 ++++++++++++++++++ viewdsl/build.gradle | 1 + .../java/splitties/viewdsl/core/ViewDsl.kt | 9 +-- .../core/experimental/GenericViewDsl.kt | 51 +++++++++++++ .../viewdsl/core/experimental/Style.kt | 20 ++++++ .../viewdsl/core/experimental/ViewFactory.kt | 72 +++++++++++++++++++ 8 files changed, 231 insertions(+), 8 deletions(-) create mode 100644 viewdsl-appcompat/src/main/java/splitties/viewdsl/appcompat/experimental/AppCompatViewFactory.kt create mode 100644 viewdsl/src/main/java/splitties/viewdsl/core/experimental/GenericViewDsl.kt create mode 100644 viewdsl/src/main/java/splitties/viewdsl/core/experimental/Style.kt create mode 100644 viewdsl/src/main/java/splitties/viewdsl/core/experimental/ViewFactory.kt diff --git a/sample/src/main/java/com/louiscad/splittiessample/main/MainActivity.kt b/sample/src/main/java/com/louiscad/splittiessample/main/MainActivity.kt index cf0739845..fdebc1f20 100644 --- a/sample/src/main/java/com/louiscad/splittiessample/main/MainActivity.kt +++ b/sample/src/main/java/com/louiscad/splittiessample/main/MainActivity.kt @@ -37,11 +37,20 @@ import splitties.snackbar.longSnack import splitties.systemservices.uiModeManager import splitties.systemservices.vibrator import splitties.toast.toast +import splitties.viewdsl.appcompat.experimental.appCompatViewFactory +import splitties.viewdsl.core.experimental.VIEW_FACTORY +import splitties.viewdsl.core.experimental.ViewFactory import splitties.viewdsl.core.setContentView import splitties.views.onClick class MainActivity : AppCompatActivity() { + private val viewFactory = ViewFactory().also { it.add(appCompatViewFactory) } + override fun getSystemService(name: String) = when(name) { + VIEW_FACTORY -> viewFactory + else -> super.getSystemService(name) + } + override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) val ui = MainUi(this) diff --git a/sample/src/main/java/com/louiscad/splittiessample/main/MainUi.kt b/sample/src/main/java/com/louiscad/splittiessample/main/MainUi.kt index 2e4a793ac..015991cfe 100644 --- a/sample/src/main/java/com/louiscad/splittiessample/main/MainUi.kt +++ b/sample/src/main/java/com/louiscad/splittiessample/main/MainUi.kt @@ -23,16 +23,17 @@ import android.support.design.widget.CollapsingToolbarLayout import android.support.design.widget.CoordinatorLayout import android.support.design.widget.FloatingActionButton import android.support.v7.app.AppCompatActivity +import android.widget.Button +import android.widget.TextView import com.louiscad.splittiessample.R import splitties.dimensions.dip import splitties.resources.dimenPxSize import splitties.resources.styledColor import splitties.resources.styledColorSL -import splitties.viewdsl.appcompat.button import splitties.viewdsl.appcompat.styles.coloredButton -import splitties.viewdsl.appcompat.textView import splitties.viewdsl.core.Ui import splitties.viewdsl.core.add +import splitties.viewdsl.core.experimental.v import splitties.viewdsl.core.lParams import splitties.viewdsl.core.margin import splitties.viewdsl.core.matchParent @@ -59,7 +60,7 @@ class MainUi(override val ctx: Context) : Ui { val launchDemoBtn = v(::coloredButton) { textResource = R.string.go_to_the_demo } - val toggleNightModeBtn = v(::button) { + val toggleNightModeBtn = v