Skip to content

Commit

Permalink
Merge pull request #628 from mikepenz/develop
Browse files Browse the repository at this point in the history 
dev -> main
  • Loading branch information
@mikepenz
mikepenz committed Sep 30, 2022
2 parents f93fbe6 + 0ddf054 commit bb04f72
Show file tree
Hide file tree
Showing 17 changed files with 7,235 additions and 6,689 deletions.
2 changes: 2 additions & 0 deletions .bundle/config
View file
@@ -0,0 +1,2 @@
---
BUNDLE_PATH: "vendor/bundle"
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
View file
Expand Up @@ -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
Expand Down
2 changes: 2 additions & 0 deletions .gitignore
View file
Expand Up @@ -28,3 +28,5 @@ proguard/
# Log Files
*.log
functiongraphic.psd

vendor/*
73 changes: 48 additions & 25 deletions Gemfile.lock
View file
@@ -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.1)
claide (1.0.3)
ast (2.4.2)
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.0.6)
danger (9.0.0)
claide (~> 1.0)
claide-plugins (>= 0.9.2)
colored2 (~> 3.1)
Expand All @@ -24,47 +24,70 @@ GEM
kramdown (~> 2.3)
kramdown-parser-gfm (~> 1.0)
no_proxy_fix
octokit (~> 4.7)
terminal-table (~> 1)
danger-android_lint (0.0.8)
octokit (~> 5.0)
terminal-table (>= 1, < 4)
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.0.1)
multipart-post (>= 1.2, < 3)
faraday-http-cache (2.2.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)
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)
git (1.11.0)
faraday-httpclient (1.0.1)
faraday-multipart (1.0.4)
multipart-post (~> 2)
faraday-net_http (1.0.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.18.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
sawyer (0.8.2)
ruby2_keywords (0.0.5)
sawyer (0.9.2)
addressable (>= 2.3.5)
faraday (> 0.8, < 2.0)
terminal-table (1.8.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
Expand All @@ -75,4 +98,4 @@ DEPENDENCIES
danger-kotlin_detekt

BUNDLED WITH
2.1.4
2.3.22
4 changes: 2 additions & 2 deletions README.md
View file
Expand Up @@ -53,7 +53,7 @@

## Latest releases 🛠

- Kotlin Next Gen | [v5.3.4](https://github.com/mikepenz/Android-Iconics/tree/v5.3.4)
- Kotlin Next Gen | [v5.4.0](https://github.com/mikepenz/Android-Iconics/tree/v5.4.0)
- Kotlin | [v4.0.2](https://github.com/mikepenz/Android-Iconics/tree/v4.0.2)
- Java AndroidX | [v3.2.5](https://github.com/mikepenz/Android-Iconics/tree/v3.2.5)
- Java Appcompat | [v3.0.4](https://github.com/mikepenz/Android-Iconics/tree/v3.0.4)
Expand Down Expand Up @@ -85,7 +85,7 @@ implementation 'com.mikepenz:material-design-iconic-typeface:2.2.0.8-kotlin@aar'
implementation 'com.mikepenz:fontawesome-typeface:5.9.0.2-kotlin@aar'
implementation 'com.mikepenz:octicons-typeface:11.1.0.0-kotlin@aar'
implementation 'com.mikepenz:meteocons-typeface:1.1.0.7-kotlin@aar'
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
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
implementation 'com.mikepenz:weather-icons-typeface:2.0.10.7-kotlin@aar'
implementation 'com.mikepenz:typeicons-typeface:2.0.7.7-kotlin@aar'
implementation 'com.mikepenz:entypo-typeface:1.0.0.7-kotlin@aar'
Expand Down
12 changes: 7 additions & 5 deletions app/src/main/AndroidManifest.xml
View file
Expand Up @@ -28,20 +28,22 @@
android:theme="@style/AppTheme"
android:supportsRtl="true"
tools:ignore="GoogleAppIndexingWarning">
<activity android:name=".MainActivity">
<activity android:name=".MainActivity" 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=".PlaygroundActivity"
android:label="@string/title_activity_playground"
android:theme="@style/AppTheme" />
android:theme="@style/AppTheme"
android:exported="false"/>
<activity
android:name="com.mikepenz.aboutlibraries.ui.LibsActivity"
android:label="@string/title_activity_playground"
android:theme="@style/AppTheme" />
android:theme="@style/AppTheme"
android:exported="false"/>
</application>

</manifest>
27 changes: 14 additions & 13 deletions build.gradle
View file
Expand Up @@ -18,37 +18,38 @@ buildscript {

ext {
release = [
versionName: "5.3.4",
versionCode: 50304
versionName: "5.4.0",
versionCode: 50400
]

setup = [
compileSdk : 31,
compileSdk : 33,
buildTools : "33.0.0",
minSdk : 16,
composeMinSdk: 21,
targetSdk : 30
targetSdk : 33
]

versions = [
kotlin : '1.6.10',
kotlin : '1.7.10',
androidX : '1.0.0',
recyclerView : '1.2.1',
material : '1.6.1',
appcompat : '1.4.2',
appcompat : '1.5.1',
drawerlayout : '1.1.0',
constraintLayout: '2.0.4',
cardview : '1.0.0',
ktx : [
core: '1.8.0'
core: '1.9.0'
],
startup : '1.1.0',
startup : '1.1.1',
detekt : '1.18.1',
aboutLibraries : '10.3.1',
materialDrawer : '9.0.0',
fastAdapter : '5.6.0',
aboutLibraries : '10.5.0',
materialDrawer : '9.0.1',
fastAdapter : '5.7.0',
// compose
compose : '1.1.1'
compose : '1.2.1',
composeCompiler : '1.3.1'
]
}

Expand All @@ -61,7 +62,7 @@ buildscript {
}

dependencies {
classpath 'com.android.tools.build:gradle:7.2.1'
classpath 'com.android.tools.build:gradle:7.3.0'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:${versions.kotlin}"
classpath "io.gitlab.arturbosch.detekt:detekt-gradle-plugin:${versions.detekt}"
classpath "com.mikepenz.aboutlibraries.plugin:aboutlibraries-plugin:${versions.aboutLibraries}"
Expand Down
4 changes: 2 additions & 2 deletions community-material-typeface-library/build.gradle
View file
Expand Up @@ -26,8 +26,8 @@ android {
minSdkVersion setup.minSdk
targetSdkVersion setup.targetSdk
consumerProguardFiles 'consumer-proguard-rules.pro'
versionCode 64950
versionName "6.4.95.0-kotlin"
versionCode 70960
versionName "7.0.96.0-kotlin"

resValue "string", "community_material_version", "${versionName}"
}
Expand Down

0 comments on commit bb04f72

Please sign in to comment.