From e8ce3d52abe4829e5fb94d244f4523bb3a608051 Mon Sep 17 00:00:00 2001 From: Mehul Kabaria Date: Tue, 12 Jul 2022 15:59:43 +0530 Subject: [PATCH] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Upgrading=20Kotlin=20lates?= =?UTF-8?q?t=20version=20=E2=AC=86=EF=B8=8F=20Upgrading=20Gradle=20version?= =?UTF-8?q?=20=E2=AC=86=EF=B8=8F=20Upgrading=20targetSDK=2031?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 4 ++-- app/build.gradle | 18 +++++++++--------- app/src/main/AndroidManifest.xml | 3 ++- build.gradle | 4 ++-- custombottomnavigation/build.gradle | 18 ++++++++++-------- .../SSCustomBottomNavigation.kt | 2 +- gradle/wrapper/gradle-wrapper.properties | 2 +- 7 files changed, 27 insertions(+), 24 deletions(-) diff --git a/README.md b/README.md index 8f49263..4f77807 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ ![alt text](https://github.com/simformsolutions/SSCustomBottomNavigation/blob/master/images/library_banner.png) # SSCustomBottomNavigation -[![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) +[![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) Getting Started ------------------------ @@ -35,7 +35,7 @@ The actual features are: ``` dependencies { - implementation 'com.github.simformsolutions:SSCustomBottomNavigation:3.2' + implementation 'com.github.simformsolutions:SSCustomBottomNavigation:3.3' } ``` diff --git a/app/build.gradle b/app/build.gradle index 6d139f1..28997c6 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -2,15 +2,15 @@ apply plugin: 'com.android.application' apply plugin: 'kotlin-android' android { - compileSdkVersion 30 + compileSdkVersion 31 buildToolsVersion "30.0.3" defaultConfig { applicationId "com.sscustombottomnavigation" minSdkVersion 21 - targetSdkVersion 30 - versionCode 3 - versionName "3.2" + targetSdkVersion 31 + versionCode 4 + versionName "3.3" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" vectorDrawables.useSupportLibrary = true } @@ -35,11 +35,11 @@ android { dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" - implementation 'androidx.appcompat:appcompat:1.3.1' - implementation 'androidx.core:core-ktx:1.6.0' - implementation 'androidx.constraintlayout:constraintlayout:2.1.0' - implementation 'androidx.navigation:navigation-fragment-ktx:2.3.5' - implementation 'androidx.navigation:navigation-ui-ktx:2.3.5' + implementation 'androidx.appcompat:appcompat:1.4.2' + implementation 'androidx.core:core-ktx:1.8.0' + implementation 'androidx.constraintlayout:constraintlayout:2.1.4' + implementation 'androidx.navigation:navigation-fragment-ktx:2.5.0' + implementation 'androidx.navigation:navigation-ui-ktx:2.5.0' implementation 'androidx.lifecycle:lifecycle-extensions:2.2.0' testImplementation 'junit:junit:4.13.2' androidTestImplementation 'androidx.test.ext:junit:1.1.3' diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index bb74fcc..953e1ec 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -11,7 +11,8 @@ android:theme="@style/AppTheme"> + android:screenOrientation="fullSensor" + android:exported="true"> diff --git a/build.gradle b/build.gradle index 452ee16..a478de6 100644 --- a/build.gradle +++ b/build.gradle @@ -1,14 +1,14 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. buildscript { - ext.kotlin_version = '1.5.30' + ext.kotlin_version = '1.6.10' repositories { google() mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:7.0.2' + classpath 'com.android.tools.build:gradle:7.2.1' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" // NOTE: Do not place your application dependencies here; they belong diff --git a/custombottomnavigation/build.gradle b/custombottomnavigation/build.gradle index 954133b..8a3a02c 100644 --- a/custombottomnavigation/build.gradle +++ b/custombottomnavigation/build.gradle @@ -11,22 +11,23 @@ afterEvaluate { from components.release groupId = 'com.simform.custombottomnavigation' artifactId = 'custombottomnavigation' - version = '3.2' + version = '3.3' } } } } android { - compileSdkVersion 30 + compileSdkVersion 31 buildToolsVersion "30.0.3" defaultConfig { minSdkVersion 21 - targetSdkVersion 30 + targetSdkVersion 31 testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" consumerProguardFiles 'consumer-rules.pro' + multiDexEnabled true } buildTypes { @@ -44,11 +45,12 @@ android { dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" - implementation 'androidx.appcompat:appcompat:1.3.1' - implementation 'androidx.core:core-ktx:1.6.0' - implementation 'com.google.android.material:material:1.5.0-alpha02' - implementation 'androidx.navigation:navigation-fragment-ktx:2.3.5' - implementation 'androidx.navigation:navigation-ui-ktx:2.3.5' + implementation 'androidx.appcompat:appcompat:1.4.2' + implementation 'androidx.core:core-ktx:1.8.0' + implementation 'com.google.android.material:material:1.7.0-alpha02' + implementation 'androidx.navigation:navigation-fragment-ktx:2.5.0' + implementation 'androidx.navigation:navigation-ui-ktx:2.5.0' + implementation 'com.android.support:multidex:2.0.1' testImplementation 'junit:junit:4.13.2' androidTestImplementation 'androidx.test.ext:junit:1.1.3' androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0' diff --git a/custombottomnavigation/src/main/java/com/simform/custombottomnavigation/SSCustomBottomNavigation.kt b/custombottomnavigation/src/main/java/com/simform/custombottomnavigation/SSCustomBottomNavigation.kt index 8935138..6bf6e6b 100644 --- a/custombottomnavigation/src/main/java/com/simform/custombottomnavigation/SSCustomBottomNavigation.kt +++ b/custombottomnavigation/src/main/java/com/simform/custombottomnavigation/SSCustomBottomNavigation.kt @@ -380,7 +380,7 @@ class SSCustomBottomNavigation : FrameLayout { private fun findStartDestination(graph: NavGraph): NavDestination { var startDestination: NavDestination = graph while (startDestination is NavGraph) { - startDestination = graph.findNode(graph.startDestination)!! + startDestination = graph.findNode(graph.startDestinationId)!! } return startDestination diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 5a74e3d..a03a13b 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip