Skip to content

Commit 460dd7f

Browse files
Merge pull request #33 from MehulKK/update_kotlin_and_gradle_version
⬆️ Upgrading Kotlin latest version
2 parents 8cfaaf4 + e8ce3d5 commit 460dd7f

File tree

7 files changed

+27
-24
lines changed

7 files changed

+27
-24
lines changed

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
![alt text](https://github.com/simformsolutions/SSCustomBottomNavigation/blob/master/images/library_banner.png)
22

33
# SSCustomBottomNavigation
4-
[![Kotlin Version](https://img.shields.io/badge/Kotlin-v1.5.30-blue.svg)](https://kotlinlang.org) [![Platform](https://img.shields.io/badge/Platform-Android-green.svg?style=flat)](https://www.android.com/) [![API](https://img.shields.io/badge/API-21%2B-brightgreen.svg?style=flat)](https://android-arsenal.com/api?level=19) [![Android Arsenal]( https://img.shields.io/badge/Android%20Arsenal-SSCustomBottomNavigation-green.svg?style=flat )](https://android-arsenal.com/details/1/8163)
4+
[![Kotlin Version](https://img.shields.io/badge/Kotlin-v1.6.10-blue.svg)](https://kotlinlang.org) [![Platform](https://img.shields.io/badge/Platform-Android-green.svg?style=flat)](https://www.android.com/) [![API](https://img.shields.io/badge/API-21%2B-brightgreen.svg?style=flat)](https://android-arsenal.com/api?level=19) [![Android Arsenal]( https://img.shields.io/badge/Android%20Arsenal-SSCustomBottomNavigation-green.svg?style=flat )](https://android-arsenal.com/details/1/8163)
55

66
Getting Started
77
------------------------
@@ -35,7 +35,7 @@ The actual features are:
3535

3636
```
3737
dependencies {
38-
implementation 'com.github.simformsolutions:SSCustomBottomNavigation:3.2'
38+
implementation 'com.github.simformsolutions:SSCustomBottomNavigation:3.3'
3939
}
4040
```
4141

app/build.gradle

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,15 @@ apply plugin: 'com.android.application'
22
apply plugin: 'kotlin-android'
33

44
android {
5-
compileSdkVersion 30
5+
compileSdkVersion 31
66
buildToolsVersion "30.0.3"
77

88
defaultConfig {
99
applicationId "com.sscustombottomnavigation"
1010
minSdkVersion 21
11-
targetSdkVersion 30
12-
versionCode 3
13-
versionName "3.2"
11+
targetSdkVersion 31
12+
versionCode 4
13+
versionName "3.3"
1414
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
1515
vectorDrawables.useSupportLibrary = true
1616
}
@@ -35,11 +35,11 @@ android {
3535
dependencies {
3636
implementation fileTree(dir: 'libs', include: ['*.jar'])
3737
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
38-
implementation 'androidx.appcompat:appcompat:1.3.1'
39-
implementation 'androidx.core:core-ktx:1.6.0'
40-
implementation 'androidx.constraintlayout:constraintlayout:2.1.0'
41-
implementation 'androidx.navigation:navigation-fragment-ktx:2.3.5'
42-
implementation 'androidx.navigation:navigation-ui-ktx:2.3.5'
38+
implementation 'androidx.appcompat:appcompat:1.4.2'
39+
implementation 'androidx.core:core-ktx:1.8.0'
40+
implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
41+
implementation 'androidx.navigation:navigation-fragment-ktx:2.5.0'
42+
implementation 'androidx.navigation:navigation-ui-ktx:2.5.0'
4343
implementation 'androidx.lifecycle:lifecycle-extensions:2.2.0'
4444
testImplementation 'junit:junit:4.13.2'
4545
androidTestImplementation 'androidx.test.ext:junit:1.1.3'

app/src/main/AndroidManifest.xml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,8 @@
1111
android:theme="@style/AppTheme">
1212
<activity
1313
android:name="com.sscustombottomnavigation.MainActivity"
14-
android:screenOrientation="portrait">
14+
android:screenOrientation="fullSensor"
15+
android:exported="true">
1516
<intent-filter>
1617
<action android:name="android.intent.action.MAIN" />
1718

build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
// Top-level build file where you can add configuration options common to all sub-projects/modules.
22

33
buildscript {
4-
ext.kotlin_version = '1.5.30'
4+
ext.kotlin_version = '1.6.10'
55
repositories {
66
google()
77
mavenCentral()
88
}
99

1010
dependencies {
11-
classpath 'com.android.tools.build:gradle:7.0.2'
11+
classpath 'com.android.tools.build:gradle:7.2.1'
1212
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
1313

1414
// NOTE: Do not place your application dependencies here; they belong

custombottomnavigation/build.gradle

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -11,22 +11,23 @@ afterEvaluate {
1111
from components.release
1212
groupId = 'com.simform.custombottomnavigation'
1313
artifactId = 'custombottomnavigation'
14-
version = '3.2'
14+
version = '3.3'
1515
}
1616
}
1717
}
1818
}
1919

2020
android {
21-
compileSdkVersion 30
21+
compileSdkVersion 31
2222
buildToolsVersion "30.0.3"
2323

2424
defaultConfig {
2525
minSdkVersion 21
26-
targetSdkVersion 30
26+
targetSdkVersion 31
2727

2828
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
2929
consumerProguardFiles 'consumer-rules.pro'
30+
multiDexEnabled true
3031
}
3132

3233
buildTypes {
@@ -44,11 +45,12 @@ android {
4445
dependencies {
4546
implementation fileTree(dir: 'libs', include: ['*.jar'])
4647
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
47-
implementation 'androidx.appcompat:appcompat:1.3.1'
48-
implementation 'androidx.core:core-ktx:1.6.0'
49-
implementation 'com.google.android.material:material:1.5.0-alpha02'
50-
implementation 'androidx.navigation:navigation-fragment-ktx:2.3.5'
51-
implementation 'androidx.navigation:navigation-ui-ktx:2.3.5'
48+
implementation 'androidx.appcompat:appcompat:1.4.2'
49+
implementation 'androidx.core:core-ktx:1.8.0'
50+
implementation 'com.google.android.material:material:1.7.0-alpha02'
51+
implementation 'androidx.navigation:navigation-fragment-ktx:2.5.0'
52+
implementation 'androidx.navigation:navigation-ui-ktx:2.5.0'
53+
implementation 'com.android.support:multidex:2.0.1'
5254
testImplementation 'junit:junit:4.13.2'
5355
androidTestImplementation 'androidx.test.ext:junit:1.1.3'
5456
androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'

custombottomnavigation/src/main/java/com/simform/custombottomnavigation/SSCustomBottomNavigation.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -380,7 +380,7 @@ class SSCustomBottomNavigation : FrameLayout {
380380
private fun findStartDestination(graph: NavGraph): NavDestination {
381381
var startDestination: NavDestination = graph
382382
while (startDestination is NavGraph) {
383-
startDestination = graph.findNode(graph.startDestination)!!
383+
startDestination = graph.findNode(graph.startDestinationId)!!
384384
}
385385

386386
return startDestination

gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-bin.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip

0 commit comments

Comments
 (0)