Skip to content

Commit 9aa7549

Browse files
r0adkllr0adkll
committed
Updated all transitive dependencies to latest version
Deprecated and removed all the Typed preferences in favor of `rx-preferences` Releasing v0.4.2
1 parent 2ab5649 commit 9aa7549

File tree

18 files changed

+51
-883
lines changed

18 files changed

+51
-883
lines changed

‎.idea/encodings.xml‎

Lines changed: 6 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎.idea/gradle.xml‎

Lines changed: 11 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎.idea/modules.xml‎

Lines changed: 0 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎build.gradle‎

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -25,20 +25,21 @@ ext {
2525
androidPlugin = 'com.android.tools.build:gradle:1.3.1'
2626
minSdkVersion = 16
2727
compileSdkVersion = 23
28-
buildToolsVersion = '23.0.1'
28+
buildToolsVersion = '23.0.2'
2929

3030
ci = 'true'.equals(System.getenv('CI'))
3131

32-
supportAnnotations = 'com.android.support:support-annotations:23.0.1'
33-
supportV4 = 'com.android.support:support-v4:23.0.1'
34-
supportRecyclerView = 'com.android.support:recyclerview-v7:23.0.1'
35-
supportAppCompat = 'com.android.support:appcompat-v7:23.0.1'
36-
supportDesign = 'com.android.support:design:23.0.1'
32+
supportAnnotations = 'com.android.support:support-annotations:23.1.1'
33+
supportV4 = 'com.android.support:support-v4:23.1.1'
34+
supportRecyclerView = 'com.android.support:recyclerview-v7:23.1.1'
35+
supportAppCompat = 'com.android.support:appcompat-v7:23.1.1'
36+
supportDesign = 'com.android.support:design:23.1.1'
3737

38-
rxJava = 'io.reactivex:rxjava:1.0.14'
39-
rxAndroid = 'io.reactivex:rxandroid:1.0.1'
38+
rxJava = 'io.reactivex:rxjava:1.1.0'
39+
rxAndroid = 'io.reactivex:rxandroid:1.1.0'
40+
rxPrefs = 'com.f2prateek.rx.preferences:rx-preferences:1.0.1'
4041

41-
timber = 'com.jakewharton.timber:timber:4.0.1'
42+
timber = 'com.jakewharton.timber:timber:4.1.0'
4243
butterKnife = 'com.jakewharton:butterknife:7.0.1'
4344

4445
}

‎gradle.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
# This option should only be used with decoupled projects. More details, visit
1717
# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
1818
# org.gradle.parallel=true
19-
VERSION_NAME=0.4.2-SNAPSHOT
19+
VERSION_NAME=0.4.2
2020
VERSION_CODE=12
2121
GROUP=com.52inc
2222

‎library-drawer/src/main/java/com/ftinc/kit/drawer/items/SwitchDrawerItem.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,12 @@
1212
import android.widget.CompoundButton;
1313
import android.widget.TextView;
1414

15+
import com.f2prateek.rx.preferences.Preference;
1516
import com.ftinc.kit.drawer.R;
1617
import com.ftinc.kit.drawer.model.BooleanPreferenceImpl;
1718
import com.ftinc.kit.drawer.model.IPreference;
1819
import com.ftinc.kit.font.Face;
1920
import com.ftinc.kit.font.FontLoader;
20-
import com.ftinc.kit.preferences.BooleanPreference;
2121

2222
import butterknife.ButterKnife;
2323

@@ -46,7 +46,7 @@ public SwitchDrawerItem(int id, int text, IPreference<Boolean> preference) {
4646
* @param id
4747
* @param text
4848
*/
49-
public SwitchDrawerItem(int id, int text, BooleanPreference preference) {
49+
public SwitchDrawerItem(int id, int text, Preference<Boolean> preference) {
5050
this(id, text, new BooleanPreferenceImpl(preference));
5151
}
5252

‎library-drawer/src/main/java/com/ftinc/kit/drawer/model/BooleanPreferenceImpl.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package com.ftinc.kit.drawer.model;
22

3-
import com.ftinc.kit.preferences.BooleanPreference;
3+
import com.f2prateek.rx.preferences.Preference;
44

55
/**
66
* Project: android-52Kit
@@ -9,9 +9,9 @@
99
*/
1010
public class BooleanPreferenceImpl implements IPreference<Boolean> {
1111

12-
private BooleanPreference preference;
12+
private Preference<Boolean> preference;
1313

14-
public BooleanPreferenceImpl(BooleanPreference preference){
14+
public BooleanPreferenceImpl(Preference<Boolean> preference){
1515
this.preference = preference;
1616
}
1717

‎library/build.gradle‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ dependencies {
3232
// Rx
3333
compile rootProject.ext.rxJava
3434
compile rootProject.ext.rxAndroid
35+
compile rootProject.ext.rxPrefs
3536

3637
}
3738

‎library/library.iml‎

Lines changed: 15 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -65,45 +65,35 @@
6565
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
6666
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
6767
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
68-
<excludeFolder url="file://$MODULE_DIR$/build/docs" />
68+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/annotations" />
6969
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
7070
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/bundles" />
7171
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
72-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/coverage-instrumented-classes" />
7372
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/dependency-cache" />
74-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/dex" />
75-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/dex-cache" />
76-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/appcompat-v7/23.0.1/jars" />
77-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/recyclerview-v7/23.0.1/jars" />
78-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-v4/23.0.1/jars" />
79-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.jakewharton.timber/timber/4.0.1/jars" />
80-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/io.reactivex/rxandroid/1.0.1/jars" />
73+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/appcompat-v7/23.1.1/jars" />
74+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/recyclerview-v7/23.1.1/jars" />
75+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-v4/23.1.1/jars" />
76+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.f2prateek.rx.preferences/rx-preferences/1.0.1/jars" />
77+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.jakewharton.timber/timber/4.1.0/jars" />
78+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/io.reactivex/rxandroid/1.1.0/jars" />
8179
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
82-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/jacoco" />
83-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/javaResources" />
84-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/libs" />
8580
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/lint" />
86-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
87-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/ndk" />
88-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/pre-dexed" />
89-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/proguard" />
9081
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
9182
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
9283
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
93-
<excludeFolder url="file://$MODULE_DIR$/build/libs" />
9484
<excludeFolder url="file://$MODULE_DIR$/build/outputs" />
95-
<excludeFolder url="file://$MODULE_DIR$/build/poms" />
9685
<excludeFolder url="file://$MODULE_DIR$/build/tmp" />
9786
</content>
9887
<orderEntry type="jdk" jdkName="Android API 23 Platform" jdkType="Android SDK" />
9988
<orderEntry type="sourceFolder" forTests="false" />
100-
<orderEntry type="library" exported="" name="timber-4.0.1" level="project" />
101-
<orderEntry type="library" exported="" name="rxjava-1.0.14" level="project" />
102-
<orderEntry type="library" exported="" name="rxandroid-1.0.1" level="project" />
103-
<orderEntry type="library" exported="" name="appcompat-v7-23.0.1" level="project" />
89+
<orderEntry type="library" exported="" name="recyclerview-v7-23.1.1" level="project" />
90+
<orderEntry type="library" exported="" name="support-annotations-23.1.1" level="project" />
91+
<orderEntry type="library" exported="" name="rx-preferences-1.0.1" level="project" />
92+
<orderEntry type="library" exported="" name="support-v4-23.1.1" level="project" />
93+
<orderEntry type="library" exported="" name="timber-4.1.0" level="project" />
94+
<orderEntry type="library" exported="" name="appcompat-v7-23.1.1" level="project" />
10495
<orderEntry type="library" exported="" name="butterknife-7.0.1" level="project" />
105-
<orderEntry type="library" exported="" name="recyclerview-v7-23.0.1" level="project" />
106-
<orderEntry type="library" exported="" name="support-v4-23.0.1" level="project" />
107-
<orderEntry type="library" exported="" name="support-annotations-23.0.1" level="project" />
96+
<orderEntry type="library" exported="" name="rxandroid-1.1.0" level="project" />
97+
<orderEntry type="library" exported="" name="rxjava-1.1.0" level="project" />
10898
</component>
10999
</module>

‎library/src/main/java/com/ftinc/kit/preferences/BooleanPreference.java‎

Lines changed: 0 additions & 59 deletions
This file was deleted.

0 commit comments

Comments
 (0)