Skip to content

Commit ab6213c

Browse files
authored
Merge pull request #1040 from mikepenz/develop
dev -> main
2 parents 1ebbcd6 + ad4c449 commit ab6213c

File tree

28 files changed

+246
-874
lines changed

28 files changed

+246
-874
lines changed

.bundle/config

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
---
2+
BUNDLE_PATH: "vendor/bundle"

.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ jobs:
5555
if: github.event_name == 'pull_request'
5656
uses: ruby/setup-ruby@v1
5757
with:
58-
ruby-version: '2.6.3'
58+
ruby-version: '3.0'
5959
bundler-cache: true
6060

6161
- name: Run Danger

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,3 +32,4 @@ proguard/
3232
!.idea/dictionaries
3333

3434
*.DS_STORE
35+
/vendor/*

Gemfile.lock

Lines changed: 44 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
11
GEM
22
remote: https://rubygems.org/
33
specs:
4-
addressable (2.8.0)
5-
public_suffix (>= 2.0.2, < 5.0)
4+
addressable (2.8.1)
5+
public_suffix (>= 2.0.2, < 6.0)
66
ansi (1.5.0)
77
ast (2.4.2)
8-
claide (1.0.3)
8+
claide (1.1.0)
99
claide-plugins (0.9.2)
1010
cork
1111
nap
1212
open4 (~> 1.3)
1313
colored2 (3.1.2)
1414
cork (0.3.0)
1515
colored2 (~> 3.1)
16-
danger (8.2.3)
16+
danger (9.0.0)
1717
claide (~> 1.0)
1818
claide-plugins (>= 0.9.2)
1919
colored2 (~> 3.1)
@@ -24,51 +24,70 @@ GEM
2424
kramdown (~> 2.3)
2525
kramdown-parser-gfm (~> 1.0)
2626
no_proxy_fix
27-
octokit (~> 4.7)
27+
octokit (~> 5.0)
2828
terminal-table (>= 1, < 4)
29-
danger-android_lint (0.0.8)
29+
danger-android_lint (0.0.11)
3030
danger-plugin-api (~> 1.0)
3131
oga
3232
danger-kotlin_detekt (0.0.3)
3333
danger-plugin-api (~> 1.0)
3434
danger-plugin-api (1.0.0)
3535
danger (> 2.0)
36-
faraday (1.3.0)
36+
faraday (1.10.2)
37+
faraday-em_http (~> 1.0)
38+
faraday-em_synchrony (~> 1.0)
39+
faraday-excon (~> 1.1)
40+
faraday-httpclient (~> 1.0)
41+
faraday-multipart (~> 1.0)
3742
faraday-net_http (~> 1.0)
38-
multipart-post (>= 1.2, < 3)
39-
ruby2_keywords
40-
faraday-http-cache (2.2.0)
43+
faraday-net_http_persistent (~> 1.0)
44+
faraday-patron (~> 1.0)
45+
faraday-rack (~> 1.0)
46+
faraday-retry (~> 1.0)
47+
ruby2_keywords (>= 0.0.4)
48+
faraday-em_http (1.0.0)
49+
faraday-em_synchrony (1.0.0)
50+
faraday-excon (1.1.0)
51+
faraday-http-cache (2.4.1)
4152
faraday (>= 0.8)
53+
faraday-httpclient (1.0.1)
54+
faraday-multipart (1.0.4)
55+
multipart-post (~> 2)
4256
faraday-net_http (1.0.1)
43-
git (1.8.1)
57+
faraday-net_http_persistent (1.2.0)
58+
faraday-patron (1.0.0)
59+
faraday-rack (1.0.0)
60+
faraday-retry (1.0.3)
61+
git (1.12.0)
62+
addressable (~> 2.8)
4463
rchardet (~> 1.8)
45-
kramdown (2.3.1)
64+
kramdown (2.4.0)
4665
rexml
4766
kramdown-parser-gfm (1.1.0)
4867
kramdown (~> 2.0)
49-
multipart-post (2.1.1)
68+
multipart-post (2.2.3)
5069
nap (1.1.0)
5170
no_proxy_fix (0.1.2)
52-
octokit (4.20.0)
53-
faraday (>= 0.9)
54-
sawyer (~> 0.8.0, >= 0.5.3)
55-
oga (3.3)
71+
octokit (5.6.1)
72+
faraday (>= 1, < 3)
73+
sawyer (~> 0.9)
74+
oga (3.4)
5675
ast
5776
ruby-ll (~> 2.1)
5877
open4 (1.3.4)
59-
public_suffix (4.0.6)
78+
public_suffix (5.0.0)
6079
rchardet (1.8.0)
6180
rexml (3.2.5)
6281
ruby-ll (2.1.2)
6382
ansi
6483
ast
65-
ruby2_keywords (0.0.4)
66-
sawyer (0.8.2)
84+
ruby2_keywords (0.0.5)
85+
sawyer (0.9.2)
6786
addressable (>= 2.3.5)
68-
faraday (> 0.8, < 2.0)
69-
terminal-table (3.0.0)
70-
unicode-display_width (~> 1.1, >= 1.1.1)
71-
unicode-display_width (1.7.0)
87+
faraday (>= 0.17.3, < 3)
88+
terminal-table (3.0.2)
89+
unicode-display_width (>= 1.1.1, < 3)
90+
unicode-display_width (2.3.0)
7291

7392
PLATFORMS
7493
ruby
@@ -79,4 +98,4 @@ DEPENDENCIES
7998
danger-kotlin_detekt
8099

81100
BUNDLED WITH
82-
2.1.4
101+
2.3.22

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ It's blazing fast, minimizing the code you need to write, and is easy to extend.
4848

4949
## Latest releases 🛠
5050

51-
- Kotlin | [v5.6.0](https://github.com/mikepenz/FastAdapter/tree/v5.6.0)
51+
- Kotlin | [v5.7.0](https://github.com/mikepenz/FastAdapter/tree/v5.7.0)
5252
- [Deprecated] Java && AndroidX | [v3.3.1](https://github.com/mikepenz/FastAdapter/tree/v3.3.1)
5353
- [Deprecated] Java && AppCompat | [v3.2.9](https://github.com/mikepenz/FastAdapter/tree/v3.2.9)
5454

app/build.gradle

Lines changed: 2 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -79,12 +79,6 @@ repositories {
7979
url "https://oss.sonatype.org/content/repositories/snapshots/"
8080
content { includeGroup "com.mikepenz.thirdparty" }
8181
}
82-
jcenter() {
83-
content {
84-
includeGroup "com.mopub"
85-
includeGroup "com.mopub.volley"
86-
}
87-
}
8882
}
8983

9084
dependencies {
@@ -148,21 +142,11 @@ dependencies {
148142

149143
//used to load the images in the ImageListSample
150144
//https://github.com/coil-kt/coil
151-
implementation 'io.coil-kt:coil:1.4.0'
145+
implementation 'io.coil-kt:coil:2.2.1'
152146

153147
//Used to provide the drag selection like google photos
154148
implementation 'com.github.MFlisar:DragSelectRecyclerView:0.3'
155149

156-
//mopub sdk to showcase the usage of the mopub adapter
157-
implementation('com.mopub:mopub-sdk:4.11.0@aar') {
158-
transitive = true
159-
exclude group: "com.google.android.exoplayer"
160-
}
161-
implementation('com.mopub:mopub-sdk-native-static:4.11.0@aar') {
162-
transitive = true
163-
exclude group: "com.google.android.exoplayer"
164-
}
165-
166150
//Used to async operations
167151
implementation 'io.reactivex.rxjava2:rxandroid:2.1.1'
168152
implementation 'io.reactivex.rxjava2:rxjava:2.2.21'
@@ -187,10 +171,9 @@ dependencies {
187171
buildscript {
188172
repositories {
189173
mavenCentral()
190-
jcenter() { content { includeGroup "io.realm" } }
191174
}
192175

193176
dependencies {
194-
classpath "io.realm:realm-gradle-plugin:10.8.1"
177+
classpath "io.realm:realm-gradle-plugin:10.12.0"
195178
}
196179
}

app/src/main/AndroidManifest.xml

Lines changed: 77 additions & 62 deletions
Original file line numberDiff line numberDiff line change
@@ -1,95 +1,110 @@
11
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
2-
xmlns:tools="http://schemas.android.com/tools"
3-
package="com.mikepenz.fastadapter.app">
2+
xmlns:tools="http://schemas.android.com/tools"
3+
package="com.mikepenz.fastadapter.app">
44

5-
<uses-permission android:name="android.permission.INTERNET" />
5+
<uses-permission android:name="android.permission.INTERNET"/>
66

77
<application
8-
android:name="com.mikepenz.fastadapter.app.CustomApplication"
9-
android:allowBackup="true"
10-
android:icon="@mipmap/ic_launcher"
11-
android:label="@string/app_name"
12-
android:networkSecurityConfig="@xml/network_security_config"
13-
android:roundIcon="@mipmap/ic_launcher_round"
14-
android:theme="@style/SampleApp.DayNight"
15-
tools:ignore="GoogleAppIndexingWarning">
8+
android:name="com.mikepenz.fastadapter.app.CustomApplication"
9+
android:allowBackup="true"
10+
android:icon="@mipmap/ic_launcher"
11+
android:label="@string/app_name"
12+
android:networkSecurityConfig="@xml/network_security_config"
13+
android:roundIcon="@mipmap/ic_launcher_round"
14+
android:theme="@style/SampleApp.DayNight"
15+
tools:ignore="GoogleAppIndexingWarning">
1616

1717
<uses-library
18-
android:name="org.apache.http.legacy"
19-
android:required="false" />
18+
android:name="org.apache.http.legacy"
19+
android:required="false"/>
2020

2121
<!-- android:supportsRtl="true" -->
22-
<activity android:name="com.mikepenz.fastadapter.app.SampleActivity">
22+
<activity android:name="com.mikepenz.fastadapter.app.SampleActivity"
23+
android:exported="true">
2324
<intent-filter>
24-
<action android:name="android.intent.action.MAIN" />
25-
<category android:name="android.intent.category.LAUNCHER" />
25+
<action android:name="android.intent.action.MAIN"/>
26+
<category android:name="android.intent.category.LAUNCHER"/>
2627
</intent-filter>
2728
</activity>
2829
<activity
29-
android:name="com.mikepenz.fastadapter.app.PagedActivity"
30-
android:label="@string/sample_paged_list" />
30+
android:name="com.mikepenz.fastadapter.app.PagedActivity"
31+
android:label="@string/sample_paged_list"
32+
android:exported="false"/>
3133
<activity
32-
android:name="com.mikepenz.fastadapter.app.SimpleItemListActivity"
33-
android:label="@string/sample_simple_item_list" />
34+
android:name="com.mikepenz.fastadapter.app.SimpleItemListActivity"
35+
android:label="@string/sample_simple_item_list"
36+
android:exported="false"/>
3437
<activity
35-
android:name="com.mikepenz.fastadapter.app.SwipeListActivity"
36-
android:label="@string/sample_swipe_list" />
38+
android:name="com.mikepenz.fastadapter.app.SwipeListActivity"
39+
android:label="@string/sample_swipe_list"
40+
android:exported="false"/>
3741
<activity
38-
android:name="com.mikepenz.fastadapter.app.SwipeDrawerListActivity"
39-
android:label="@string/sample_swipe_drawer_list" />
42+
android:name="com.mikepenz.fastadapter.app.SwipeDrawerListActivity"
43+
android:label="@string/sample_swipe_drawer_list"
44+
android:exported="false"/>
4045
<activity
41-
android:name="com.mikepenz.fastadapter.app.ImageListActivity"
42-
android:label="@string/sample_image_list" />
46+
android:name="com.mikepenz.fastadapter.app.ImageListActivity"
47+
android:label="@string/sample_image_list"
48+
android:exported="false"/>
4349
<activity
44-
android:name="com.mikepenz.fastadapter.app.MultiselectSampleActivity"
45-
android:label="@string/sample_multi_select" />
50+
android:name="com.mikepenz.fastadapter.app.MultiselectSampleActivity"
51+
android:label="@string/sample_multi_select"
52+
android:exported="false"/>
4653
<activity
47-
android:name="com.mikepenz.fastadapter.app.ExpandableSampleActivity"
48-
android:label="@string/sample_collapsible" />
54+
android:name="com.mikepenz.fastadapter.app.ExpandableSampleActivity"
55+
android:label="@string/sample_collapsible"
56+
android:exported="false"/>
4957
<activity
50-
android:name="com.mikepenz.fastadapter.app.ExpandableMultiselectDeleteSampleActivity"
51-
android:label="@string/sample_collapsible_multi_select_delete" />
58+
android:name="com.mikepenz.fastadapter.app.ExpandableMultiselectDeleteSampleActivity"
59+
android:label="@string/sample_collapsible_multi_select_delete"
60+
android:exported="false"/>
5261
<activity
53-
android:name="com.mikepenz.fastadapter.app.StickyHeaderSampleActivity"
54-
android:label="@string/sample_sticky_header" />
62+
android:name="com.mikepenz.fastadapter.app.StickyHeaderSampleActivity"
63+
android:label="@string/sample_sticky_header"
64+
android:exported="false"/>
5565
<activity
56-
android:name="com.mikepenz.fastadapter.app.AdvancedSampleActivity"
57-
android:label="@string/sample_advanced" />
66+
android:name="com.mikepenz.fastadapter.app.AdvancedSampleActivity"
67+
android:label="@string/sample_advanced"
68+
android:exported="false"/>
5869
<activity
59-
android:name="com.mikepenz.fastadapter.app.IconGridActivity"
60-
android:label="@string/sample_icon_grid" />
70+
android:name="com.mikepenz.fastadapter.app.IconGridActivity"
71+
android:label="@string/sample_icon_grid"
72+
android:exported="false"/>
6173
<activity
62-
android:name="com.mikepenz.fastadapter.app.ModelItemActivity"
63-
android:label="@string/sample_model_item" />
74+
android:name="com.mikepenz.fastadapter.app.ModelItemActivity"
75+
android:label="@string/sample_model_item"
76+
android:exported="false"/>
6477
<activity
65-
android:name="com.mikepenz.fastadapter.app.MultiTypeModelItemActivity"
66-
android:label="@string/sample_multi_model_item" />
78+
android:name="com.mikepenz.fastadapter.app.MultiTypeModelItemActivity"
79+
android:label="@string/sample_multi_model_item"
80+
android:exported="false"/>
6781
<activity
68-
android:name="com.mikepenz.fastadapter.app.CheckBoxSampleActivity"
69-
android:label="@string/sample_checkbox_item" />
82+
android:name="com.mikepenz.fastadapter.app.CheckBoxSampleActivity"
83+
android:label="@string/sample_checkbox_item"
84+
android:exported="false"/>
7085
<activity
71-
android:name="com.mikepenz.fastadapter.app.RadioButtonSampleActivity"
72-
android:label="@string/sample_radiobutton_item" />
86+
android:name="com.mikepenz.fastadapter.app.RadioButtonSampleActivity"
87+
android:label="@string/sample_radiobutton_item"
88+
android:exported="false"/>
7389
<activity
74-
android:name="com.mikepenz.fastadapter.app.EndlessScrollListActivity"
75-
android:label="@string/sample_endless_scroll_item" />
90+
android:name="com.mikepenz.fastadapter.app.EndlessScrollListActivity"
91+
android:label="@string/sample_endless_scroll_item"
92+
android:exported="false"/>
7693
<activity
77-
android:name="com.mikepenz.fastadapter.app.SortActivity"
78-
android:label="@string/sample_sort" />
94+
android:name="com.mikepenz.fastadapter.app.SortActivity"
95+
android:label="@string/sample_sort"
96+
android:exported="false"/>
7997
<activity
80-
android:name="com.mikepenz.fastadapter.app.MopubAdsActivity"
81-
android:label="@string/sample_mopub" />
98+
android:name="com.mikepenz.fastadapter.app.RealmActivity"
99+
android:label="@string/sample_realm_list"
100+
android:exported="false"/>
82101
<activity
83-
android:name="com.mikepenz.fastadapter.app.RealmActivity"
84-
android:label="@string/sample_realm_list" />
102+
android:name="com.mikepenz.fastadapter.app.DiffUtilActivity"
103+
android:label="@string/sample_diff_util"
104+
android:exported="false"/>
85105
<activity
86-
android:name="com.mikepenz.fastadapter.app.StickyHeaderMopubAdsActivity"
87-
android:label="@string/sample_sticky_header_mopub" />
88-
<activity
89-
android:name="com.mikepenz.fastadapter.app.DiffUtilActivity"
90-
android:label="@string/sample_diff_util" />
91-
<activity
92-
android:name="com.mikepenz.fastadapter.app.DragAndDropActivity"
93-
android:label="Drag &amp; Drop Sample" />
106+
android:name="com.mikepenz.fastadapter.app.DragAndDropActivity"
107+
android:label="Drag &amp; Drop Sample"
108+
android:exported="false"/>
94109
</application>
95110
</manifest>

0 commit comments

Comments
 (0)