diff --git a/app/build.gradle b/app/build.gradle index ca47e18..09acd3b 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -3,13 +3,13 @@ apply plugin: 'kotlin-android' apply plugin: 'kotlin-android-extensions' android { - compileSdkVersion 30 + compileSdkVersion 31 defaultConfig { applicationId "com.fitworkoutfast" minSdkVersion 21 - targetSdkVersion 30 - versionCode 58 - versionName "0.24.05" + targetSdkVersion 31 + versionCode 61 + versionName "0.24.07" vectorDrawables.useSupportLibrary = true } @@ -65,7 +65,7 @@ android { } kotlinOptions { - jvmTarget = JavaVersion.VERSION_1_8.toString() + jvmTarget = JavaVersion.VERSION_14.toString() } lintOptions { @@ -79,8 +79,8 @@ dependencies { // Support implementation 'androidx.annotation:annotation:1.2.0' - implementation "androidx.constraintlayout:constraintlayout:2.1.0" - implementation 'androidx.appcompat:appcompat:1.4.0-alpha03' + implementation "androidx.constraintlayout:constraintlayout:2.1.1" + implementation 'androidx.appcompat:appcompat:1.4.0-beta01' implementation 'androidx.cardview:cardview:1.0.0' implementation 'androidx.coordinatorlayout:coordinatorlayout:1.1.0' implementation 'androidx.drawerlayout:drawerlayout:1.1.1' diff --git a/app/release/app-release.aab b/app/release/app-release.aab new file mode 100644 index 0000000..359df4a Binary files /dev/null and b/app/release/app-release.aab differ diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index c977531..e685430 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -21,7 +21,8 @@ android:name="com.fitworkoutfast.MainActivity" android:configChanges="orientation|screenSize" android:label="@string/app_name" - android:windowSoftInputMode="stateUnchanged"> + android:windowSoftInputMode="stateUnchanged" + android:exported="true"> @@ -30,10 +31,12 @@ - + android:theme="@style/Theme.Intro" + android:exported="false"/> + + + + diff --git a/build.gradle b/build.gradle index afc9521..1a088d6 100644 --- a/build.gradle +++ b/build.gradle @@ -1,7 +1,7 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. buildscript { - ext.kotlin_version = '1.4.10' + ext.kotlin_version = '1.5.20' repositories { google() jcenter() @@ -12,7 +12,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:4.1.2' + classpath 'com.android.tools.build:gradle:7.0.2' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" //classpath 'com.google.gms:google-services:4.2.0' diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 230fdb5..de8123e 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-6.5-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-bin.zip