Merge pull request #1040 from mikepenz/develop

dev -> main
mikepenz · Sep 30, 2022 · ab6213c · ab6213c
2 parents 1ebbcd6 + ad4c449
commit ab6213c
Show file tree

Hide file tree

Showing 28 changed files with 246 additions and 874 deletions.
diff --git a/.bundle/config b/.bundle/config
@@ -0,0 +1,2 @@
+---
+BUNDLE_PATH: "vendor/bundle"
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -55,7 +55,7 @@ jobs:
         if: github.event_name  == 'pull_request'
         uses: ruby/setup-ruby@v1
         with:
-          ruby-version: '2.6.3'
+          ruby-version: '3.0'
           bundler-cache: true
 
       - name: Run Danger

diff --git a/.gitignore b/.gitignore
@@ -32,3 +32,4 @@ proguard/
 !.idea/dictionaries
 
 *.DS_STORE
+/vendor/*
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -1,19 +1,19 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    addressable (2.8.0)
-      public_suffix (>= 2.0.2, < 5.0)
+    addressable (2.8.1)
+      public_suffix (>= 2.0.2, < 6.0)
     ansi (1.5.0)
     ast (2.4.2)
-    claide (1.0.3)
+    claide (1.1.0)
     claide-plugins (0.9.2)
       cork
       nap
       open4 (~> 1.3)
     colored2 (3.1.2)
     cork (0.3.0)
       colored2 (~> 3.1)
-    danger (8.2.3)
+    danger (9.0.0)
       claide (~> 1.0)
       claide-plugins (>= 0.9.2)
       colored2 (~> 3.1)
@@ -24,51 +24,70 @@ GEM
       kramdown (~> 2.3)
       kramdown-parser-gfm (~> 1.0)
       no_proxy_fix
-      octokit (~> 4.7)
+      octokit (~> 5.0)
       terminal-table (>= 1, < 4)
-    danger-android_lint (0.0.8)
+    danger-android_lint (0.0.11)
       danger-plugin-api (~> 1.0)
       oga
     danger-kotlin_detekt (0.0.3)
       danger-plugin-api (~> 1.0)
     danger-plugin-api (1.0.0)
       danger (> 2.0)
-    faraday (1.3.0)
+    faraday (1.10.2)
+      faraday-em_http (~> 1.0)
+      faraday-em_synchrony (~> 1.0)
+      faraday-excon (~> 1.1)
+      faraday-httpclient (~> 1.0)
+      faraday-multipart (~> 1.0)
       faraday-net_http (~> 1.0)
-      multipart-post (>= 1.2, < 3)
-      ruby2_keywords
-    faraday-http-cache (2.2.0)
+      faraday-net_http_persistent (~> 1.0)
+      faraday-patron (~> 1.0)
+      faraday-rack (~> 1.0)
+      faraday-retry (~> 1.0)
+      ruby2_keywords (>= 0.0.4)
+    faraday-em_http (1.0.0)
+    faraday-em_synchrony (1.0.0)
+    faraday-excon (1.1.0)
+    faraday-http-cache (2.4.1)
       faraday (>= 0.8)
+    faraday-httpclient (1.0.1)
+    faraday-multipart (1.0.4)
+      multipart-post (~> 2)
     faraday-net_http (1.0.1)
-    git (1.8.1)
+    faraday-net_http_persistent (1.2.0)
+    faraday-patron (1.0.0)
+    faraday-rack (1.0.0)
+    faraday-retry (1.0.3)
+    git (1.12.0)
+      addressable (~> 2.8)
       rchardet (~> 1.8)
-    kramdown (2.3.1)
+    kramdown (2.4.0)
       rexml
     kramdown-parser-gfm (1.1.0)
       kramdown (~> 2.0)
-    multipart-post (2.1.1)
+    multipart-post (2.2.3)
     nap (1.1.0)
     no_proxy_fix (0.1.2)
-    octokit (4.20.0)
-      faraday (>= 0.9)
-      sawyer (~> 0.8.0, >= 0.5.3)
-    oga (3.3)
+    octokit (5.6.1)
+      faraday (>= 1, < 3)
+      sawyer (~> 0.9)
+    oga (3.4)
       ast
       ruby-ll (~> 2.1)
     open4 (1.3.4)
-    public_suffix (4.0.6)
+    public_suffix (5.0.0)
     rchardet (1.8.0)
     rexml (3.2.5)
     ruby-ll (2.1.2)
       ansi
       ast
-    ruby2_keywords (0.0.4)
-    sawyer (0.8.2)
+    ruby2_keywords (0.0.5)
+    sawyer (0.9.2)
       addressable (>= 2.3.5)
-      faraday (> 0.8, < 2.0)
-    terminal-table (3.0.0)
-      unicode-display_width (~> 1.1, >= 1.1.1)
-    unicode-display_width (1.7.0)
+      faraday (>= 0.17.3, < 3)
+    terminal-table (3.0.2)
+      unicode-display_width (>= 1.1.1, < 3)
+    unicode-display_width (2.3.0)
 
 PLATFORMS
   ruby
@@ -79,4 +98,4 @@ DEPENDENCIES
   danger-kotlin_detekt
 
 BUNDLED WITH
-   2.1.4
+   2.3.22
diff --git a/README.md b/README.md
@@ -48,7 +48,7 @@ It's blazing fast, minimizing the code you need to write, and is easy to extend.
 
 ## Latest releases 🛠
 
-- Kotlin | [v5.6.0](https://github.com/mikepenz/FastAdapter/tree/v5.6.0)
+- Kotlin | [v5.7.0](https://github.com/mikepenz/FastAdapter/tree/v5.7.0)
 - [Deprecated] Java && AndroidX | [v3.3.1](https://github.com/mikepenz/FastAdapter/tree/v3.3.1)
 - [Deprecated] Java && AppCompat | [v3.2.9](https://github.com/mikepenz/FastAdapter/tree/v3.2.9)
 

diff --git a/app/build.gradle b/app/build.gradle
@@ -79,12 +79,6 @@ repositories {
         url "https://oss.sonatype.org/content/repositories/snapshots/"
         content { includeGroup "com.mikepenz.thirdparty" }
     }
-    jcenter() {
-        content {
-            includeGroup "com.mopub"
-            includeGroup "com.mopub.volley"
-        }
-    }
 }
 
 dependencies {
@@ -148,21 +142,11 @@ dependencies {
 
     //used to load the images in the ImageListSample
     //https://github.com/coil-kt/coil
-    implementation 'io.coil-kt:coil:1.4.0'
+    implementation 'io.coil-kt:coil:2.2.1'
 
     //Used to provide the drag selection like google photos
     implementation 'com.github.MFlisar:DragSelectRecyclerView:0.3'
 
-    //mopub sdk to showcase the usage of the mopub adapter
-    implementation('com.mopub:mopub-sdk:4.11.0@aar') {
-        transitive = true
-        exclude group: "com.google.android.exoplayer"
-    }
-    implementation('com.mopub:mopub-sdk-native-static:4.11.0@aar') {
-        transitive = true
-        exclude group: "com.google.android.exoplayer"
-    }
-
     //Used to async operations
     implementation 'io.reactivex.rxjava2:rxandroid:2.1.1'
     implementation 'io.reactivex.rxjava2:rxjava:2.2.21'
@@ -187,10 +171,9 @@ dependencies {
 buildscript {
     repositories {
         mavenCentral()
-        jcenter() { content { includeGroup "io.realm" } }
     }
 
     dependencies {
-        classpath "io.realm:realm-gradle-plugin:10.8.1"
+        classpath "io.realm:realm-gradle-plugin:10.12.0"
     }
 }
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -1,95 +1,110 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    package="com.mikepenz.fastadapter.app">
+          xmlns:tools="http://schemas.android.com/tools"
+          package="com.mikepenz.fastadapter.app">
 
-    <uses-permission android:name="android.permission.INTERNET" />
+    <uses-permission android:name="android.permission.INTERNET"/>
 
     <application
-        android:name="com.mikepenz.fastadapter.app.CustomApplication"
-        android:allowBackup="true"
-        android:icon="@mipmap/ic_launcher"
-        android:label="@string/app_name"
-        android:networkSecurityConfig="@xml/network_security_config"
-        android:roundIcon="@mipmap/ic_launcher_round"
-        android:theme="@style/SampleApp.DayNight"
-        tools:ignore="GoogleAppIndexingWarning">
+            android:name="com.mikepenz.fastadapter.app.CustomApplication"
+            android:allowBackup="true"
+            android:icon="@mipmap/ic_launcher"
+            android:label="@string/app_name"
+            android:networkSecurityConfig="@xml/network_security_config"
+            android:roundIcon="@mipmap/ic_launcher_round"
+            android:theme="@style/SampleApp.DayNight"
+            tools:ignore="GoogleAppIndexingWarning">
 
         <uses-library
-            android:name="org.apache.http.legacy"
-            android:required="false" />
+                android:name="org.apache.http.legacy"
+                android:required="false"/>
 
         <!-- android:supportsRtl="true" -->
-        <activity android:name="com.mikepenz.fastadapter.app.SampleActivity">
+        <activity android:name="com.mikepenz.fastadapter.app.SampleActivity"
+                  android:exported="true">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.LAUNCHER" />
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="android.intent.category.LAUNCHER"/>
             </intent-filter>
         </activity>
         <activity
-            android:name="com.mikepenz.fastadapter.app.PagedActivity"
-            android:label="@string/sample_paged_list" />
+                android:name="com.mikepenz.fastadapter.app.PagedActivity"
+                android:label="@string/sample_paged_list"
+                android:exported="false"/>
         <activity
-            android:name="com.mikepenz.fastadapter.app.SimpleItemListActivity"
-            android:label="@string/sample_simple_item_list" />
+                android:name="com.mikepenz.fastadapter.app.SimpleItemListActivity"
+                android:label="@string/sample_simple_item_list"
+                android:exported="false"/>
         <activity
-            android:name="com.mikepenz.fastadapter.app.SwipeListActivity"
-            android:label="@string/sample_swipe_list" />
+                android:name="com.mikepenz.fastadapter.app.SwipeListActivity"
+                android:label="@string/sample_swipe_list"
+                android:exported="false"/>
         <activity
-            android:name="com.mikepenz.fastadapter.app.SwipeDrawerListActivity"
-            android:label="@string/sample_swipe_drawer_list" />
+                android:name="com.mikepenz.fastadapter.app.SwipeDrawerListActivity"
+                android:label="@string/sample_swipe_drawer_list"
+                android:exported="false"/>
         <activity
-            android:name="com.mikepenz.fastadapter.app.ImageListActivity"
-            android:label="@string/sample_image_list" />
+                android:name="com.mikepenz.fastadapter.app.ImageListActivity"
+                android:label="@string/sample_image_list"
+                android:exported="false"/>
         <activity
-            android:name="com.mikepenz.fastadapter.app.MultiselectSampleActivity"
-            android:label="@string/sample_multi_select" />
+                android:name="com.mikepenz.fastadapter.app.MultiselectSampleActivity"
+                android:label="@string/sample_multi_select"
+                android:exported="false"/>
         <activity
-            android:name="com.mikepenz.fastadapter.app.ExpandableSampleActivity"
-            android:label="@string/sample_collapsible" />
+                android:name="com.mikepenz.fastadapter.app.ExpandableSampleActivity"
+                android:label="@string/sample_collapsible"
+                android:exported="false"/>
         <activity
-            android:name="com.mikepenz.fastadapter.app.ExpandableMultiselectDeleteSampleActivity"
-            android:label="@string/sample_collapsible_multi_select_delete" />
+                android:name="com.mikepenz.fastadapter.app.ExpandableMultiselectDeleteSampleActivity"
+                android:label="@string/sample_collapsible_multi_select_delete"
+                android:exported="false"/>
         <activity
-            android:name="com.mikepenz.fastadapter.app.StickyHeaderSampleActivity"
-            android:label="@string/sample_sticky_header" />
+                android:name="com.mikepenz.fastadapter.app.StickyHeaderSampleActivity"
+                android:label="@string/sample_sticky_header"
+                android:exported="false"/>
         <activity
-            android:name="com.mikepenz.fastadapter.app.AdvancedSampleActivity"
-            android:label="@string/sample_advanced" />
+                android:name="com.mikepenz.fastadapter.app.AdvancedSampleActivity"
+                android:label="@string/sample_advanced"
+                android:exported="false"/>
         <activity
-            android:name="com.mikepenz.fastadapter.app.IconGridActivity"
-            android:label="@string/sample_icon_grid" />
+                android:name="com.mikepenz.fastadapter.app.IconGridActivity"
+                android:label="@string/sample_icon_grid"
+                android:exported="false"/>
         <activity
-            android:name="com.mikepenz.fastadapter.app.ModelItemActivity"
-            android:label="@string/sample_model_item" />
+                android:name="com.mikepenz.fastadapter.app.ModelItemActivity"
+                android:label="@string/sample_model_item"
+                android:exported="false"/>
         <activity
-            android:name="com.mikepenz.fastadapter.app.MultiTypeModelItemActivity"
-            android:label="@string/sample_multi_model_item" />
+                android:name="com.mikepenz.fastadapter.app.MultiTypeModelItemActivity"
+                android:label="@string/sample_multi_model_item"
+                android:exported="false"/>
         <activity
-            android:name="com.mikepenz.fastadapter.app.CheckBoxSampleActivity"
-            android:label="@string/sample_checkbox_item" />
+                android:name="com.mikepenz.fastadapter.app.CheckBoxSampleActivity"
+                android:label="@string/sample_checkbox_item"
+                android:exported="false"/>
         <activity
-            android:name="com.mikepenz.fastadapter.app.RadioButtonSampleActivity"
-            android:label="@string/sample_radiobutton_item" />
+                android:name="com.mikepenz.fastadapter.app.RadioButtonSampleActivity"
+                android:label="@string/sample_radiobutton_item"
+                android:exported="false"/>
         <activity
-            android:name="com.mikepenz.fastadapter.app.EndlessScrollListActivity"
-            android:label="@string/sample_endless_scroll_item" />
+                android:name="com.mikepenz.fastadapter.app.EndlessScrollListActivity"
+                android:label="@string/sample_endless_scroll_item"
+                android:exported="false"/>
         <activity
-            android:name="com.mikepenz.fastadapter.app.SortActivity"
-            android:label="@string/sample_sort" />
+                android:name="com.mikepenz.fastadapter.app.SortActivity"
+                android:label="@string/sample_sort"
+                android:exported="false"/>
         <activity
-            android:name="com.mikepenz.fastadapter.app.MopubAdsActivity"
-            android:label="@string/sample_mopub" />
+                android:name="com.mikepenz.fastadapter.app.RealmActivity"
+                android:label="@string/sample_realm_list"
+                android:exported="false"/>
         <activity
-            android:name="com.mikepenz.fastadapter.app.RealmActivity"
-            android:label="@string/sample_realm_list" />
+                android:name="com.mikepenz.fastadapter.app.DiffUtilActivity"
+                android:label="@string/sample_diff_util"
+                android:exported="false"/>
         <activity
-            android:name="com.mikepenz.fastadapter.app.StickyHeaderMopubAdsActivity"
-            android:label="@string/sample_sticky_header_mopub" />
-        <activity
-            android:name="com.mikepenz.fastadapter.app.DiffUtilActivity"
-            android:label="@string/sample_diff_util" />
-        <activity
-            android:name="com.mikepenz.fastadapter.app.DragAndDropActivity"
-            android:label="Drag &amp; Drop Sample" />
+                android:name="com.mikepenz.fastadapter.app.DragAndDropActivity"
+                android:label="Drag &amp; Drop Sample"
+                android:exported="false"/>
     </application>
 </manifest>
Original file line number	Diff line number	Diff line change
Expand Up		@@ -32,3 +32,4 @@ proguard/
		!.idea/dictionaries

		*.DS_STORE
		/vendor/*