Skip to content

Commit bb04f72

Browse files
mikepenzmikepenz
authored
Merge pull request #628 from mikepenz/develop
dev -> main
2 parents f93fbe6 + 0ddf054 commit bb04f72

File tree

17 files changed

+7235
-6689
lines changed

17 files changed

+7235
-6689
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: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,3 +28,5 @@ proguard/
2828
# Log Files
2929
*.log
3030
functiongraphic.psd
31+
32+
vendor/*

‎Gemfile.lock

Lines changed: 48 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)
7-
ast (2.4.1)
8-
claide (1.0.3)
7+
ast (2.4.2)
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.0.6)
16+
danger (9.0.0)
1717
claide (~> 1.0)
1818
claide-plugins (>= 0.9.2)
1919
colored2 (~> 3.1)
@@ -24,47 +24,70 @@ GEM
2424
kramdown (~> 2.3)
2525
kramdown-parser-gfm (~> 1.0)
2626
no_proxy_fix
27-
octokit (~> 4.7)
28-
terminal-table (~> 1)
29-
danger-android_lint (0.0.8)
27+
octokit (~> 5.0)
28+
terminal-table (>= 1, < 4)
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.0.1)
37-
multipart-post (>= 1.2, < 3)
38-
faraday-http-cache (2.2.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)
42+
faraday-net_http (~> 1.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)
3952
faraday (>= 0.8)
40-
git (1.11.0)
53+
faraday-httpclient (1.0.1)
54+
faraday-multipart (1.0.4)
55+
multipart-post (~> 2)
56+
faraday-net_http (1.0.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)
4163
rchardet (~> 1.8)
42-
kramdown (2.3.1)
64+
kramdown (2.4.0)
4365
rexml
4466
kramdown-parser-gfm (1.1.0)
4567
kramdown (~> 2.0)
46-
multipart-post (2.1.1)
68+
multipart-post (2.2.3)
4769
nap (1.1.0)
4870
no_proxy_fix (0.1.2)
49-
octokit (4.18.0)
50-
faraday (>= 0.9)
51-
sawyer (~> 0.8.0, >= 0.5.3)
52-
oga (3.3)
71+
octokit (5.6.1)
72+
faraday (>= 1, < 3)
73+
sawyer (~> 0.9)
74+
oga (3.4)
5375
ast
5476
ruby-ll (~> 2.1)
5577
open4 (1.3.4)
56-
public_suffix (4.0.6)
78+
public_suffix (5.0.0)
5779
rchardet (1.8.0)
5880
rexml (3.2.5)
5981
ruby-ll (2.1.2)
6082
ansi
6183
ast
62-
sawyer (0.8.2)
84+
ruby2_keywords (0.0.5)
85+
sawyer (0.9.2)
6386
addressable (>= 2.3.5)
64-
faraday (> 0.8, < 2.0)
65-
terminal-table (1.8.0)
66-
unicode-display_width (~> 1.1, >= 1.1.1)
67-
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)
6891

6992
PLATFORMS
7093
ruby
@@ -75,4 +98,4 @@ DEPENDENCIES
7598
danger-kotlin_detekt
7699

77100
BUNDLED WITH
78-
2.1.4
101+
2.3.22

‎README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@
5353

5454
## Latest releases 🛠
5555

56-
- Kotlin Next Gen | [v5.3.4](https://github.com/mikepenz/Android-Iconics/tree/v5.3.4)
56+
- Kotlin Next Gen | [v5.4.0](https://github.com/mikepenz/Android-Iconics/tree/v5.4.0)
5757
- Kotlin | [v4.0.2](https://github.com/mikepenz/Android-Iconics/tree/v4.0.2)
5858
- Java AndroidX | [v3.2.5](https://github.com/mikepenz/Android-Iconics/tree/v3.2.5)
5959
- Java Appcompat | [v3.0.4](https://github.com/mikepenz/Android-Iconics/tree/v3.0.4)
@@ -85,7 +85,7 @@ implementation 'com.mikepenz:material-design-iconic-typeface:2.2.0.8-kotlin@aar'
8585
implementation 'com.mikepenz:fontawesome-typeface:5.9.0.2-kotlin@aar'
8686
implementation 'com.mikepenz:octicons-typeface:11.1.0.0-kotlin@aar'
8787
implementation 'com.mikepenz:meteocons-typeface:1.1.0.7-kotlin@aar'
88-
implementation 'com.mikepenz:community-material-typeface:6.4.95.0-kotlin@aar' // note 5.3.45.1 and newer alphabetically sorts, and merges in 3 sections
88+
implementation 'com.mikepenz:community-material-typeface:7.0.96.0-kotlin@aar' // note 5.3.45.1 and newer alphabetically sorts, and merges in 3 sections
8989
implementation 'com.mikepenz:weather-icons-typeface:2.0.10.7-kotlin@aar'
9090
implementation 'com.mikepenz:typeicons-typeface:2.0.7.7-kotlin@aar'
9191
implementation 'com.mikepenz:entypo-typeface:1.0.0.7-kotlin@aar'

‎app/src/main/AndroidManifest.xml

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -28,20 +28,22 @@
2828
android:theme="@style/AppTheme"
2929
android:supportsRtl="true"
3030
tools:ignore="GoogleAppIndexingWarning">
31-
<activity android:name=".MainActivity">
31+
<activity android:name=".MainActivity" android:exported="true">
3232
<intent-filter>
33-
<action android:name="android.intent.action.MAIN" />
34-
<category android:name="android.intent.category.LAUNCHER" />
33+
<action android:name="android.intent.action.MAIN"/>
34+
<category android:name="android.intent.category.LAUNCHER"/>
3535
</intent-filter>
3636
</activity>
3737
<activity
3838
android:name=".PlaygroundActivity"
3939
android:label="@string/title_activity_playground"
40-
android:theme="@style/AppTheme" />
40+
android:theme="@style/AppTheme"
41+
android:exported="false"/>
4142
<activity
4243
android:name="com.mikepenz.aboutlibraries.ui.LibsActivity"
4344
android:label="@string/title_activity_playground"
44-
android:theme="@style/AppTheme" />
45+
android:theme="@style/AppTheme"
46+
android:exported="false"/>
4547
</application>
4648

4749
</manifest>

‎build.gradle

Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -18,37 +18,38 @@ buildscript {
1818

1919
ext {
2020
release = [
21-
versionName: "5.3.4",
22-
versionCode: 50304
21+
versionName: "5.4.0",
22+
versionCode: 50400
2323
]
2424

2525
setup = [
26-
compileSdk : 31,
26+
compileSdk : 33,
2727
buildTools : "33.0.0",
2828
minSdk : 16,
2929
composeMinSdk: 21,
30-
targetSdk : 30
30+
targetSdk : 33
3131
]
3232

3333
versions = [
34-
kotlin : '1.6.10',
34+
kotlin : '1.7.10',
3535
androidX : '1.0.0',
3636
recyclerView : '1.2.1',
3737
material : '1.6.1',
38-
appcompat : '1.4.2',
38+
appcompat : '1.5.1',
3939
drawerlayout : '1.1.0',
4040
constraintLayout: '2.0.4',
4141
cardview : '1.0.0',
4242
ktx : [
43-
core: '1.8.0'
43+
core: '1.9.0'
4444
],
45-
startup : '1.1.0',
45+
startup : '1.1.1',
4646
detekt : '1.18.1',
47-
aboutLibraries : '10.3.1',
48-
materialDrawer : '9.0.0',
49-
fastAdapter : '5.6.0',
47+
aboutLibraries : '10.5.0',
48+
materialDrawer : '9.0.1',
49+
fastAdapter : '5.7.0',
5050
// compose
51-
compose : '1.1.1'
51+
compose : '1.2.1',
52+
composeCompiler : '1.3.1'
5253
]
5354
}
5455

@@ -61,7 +62,7 @@ buildscript {
6162
}
6263

6364
dependencies {
64-
classpath 'com.android.tools.build:gradle:7.2.1'
65+
classpath 'com.android.tools.build:gradle:7.3.0'
6566
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:${versions.kotlin}"
6667
classpath "io.gitlab.arturbosch.detekt:detekt-gradle-plugin:${versions.detekt}"
6768
classpath "com.mikepenz.aboutlibraries.plugin:aboutlibraries-plugin:${versions.aboutLibraries}"

‎community-material-typeface-library/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@ android {
2626
minSdkVersion setup.minSdk
2727
targetSdkVersion setup.targetSdk
2828
consumerProguardFiles 'consumer-proguard-rules.pro'
29-
versionCode 64950
30-
versionName "6.4.95.0-kotlin"
29+
versionCode 70960
30+
versionName "7.0.96.0-kotlin"
3131

3232
resValue "string", "community_material_version", "${versionName}"
3333
}

0 commit comments

Comments
 (0)