Skip to content

Commit

Permalink
Updated target sdk to 31 and some other libs
Browse files Browse the repository at this point in the history
* Updated target sdk to 31 and some other libs
* Fixed merge request job

Co-authored-by: Kiseleva Anastasiya Alekseevna <[email protected]>
Co-authored-by: Stanislav Mukhametshin <[email protected]>
  • Loading branch information
3 people authored Aug 30, 2022
1 parent f348756 commit 8213a4b
Show file tree
Hide file tree
Showing 6 changed files with 17 additions and 16 deletions.
4 changes: 1 addition & 3 deletions .github/workflows/merge_request.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,4 @@ on:

jobs:
check:
uses: tinkoff-mobile-tech/workflows/.github/workflows/android_lib.merge_request.yml@v1
with:
java_version: '8'
uses: tinkoff-mobile-tech/workflows/.github/workflows/android_lib.merge_request.yml@v1
16 changes: 8 additions & 8 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -4,18 +4,18 @@ buildscript {

repositories {
google()
jcenter()
mavenCentral()
}
dependencies {
classpath 'com.android.tools.build:gradle:3.6.4'
classpath 'com.android.tools.build:gradle:7.1.3'
}
}

allprojects {
repositories {
if (useMavenLocal) mavenLocal()
google()
jcenter()
mavenCentral()
}
}

Expand All @@ -25,16 +25,16 @@ task clean(type: Delete) {

ext {
minSdk = 14
compileSdk = 28
targetSdk = 28
compileSdk = 31
targetSdk = 31

isRelease = project.hasProperty('release')
versionName = isRelease ? VERSION_NAME : "$VERSION_NAME-SNAPSHOT"

appCompatVersion = "1.2.0"
constraintLayoutVersion = "2.0.4"
appCompatVersion = "1.4.1"
constraintLayoutVersion = "2.1.4"
viewPagerVersion = "1.0.0"
viewPager2Version = "1.0.0"
cardViewVersion = "1.0.0"
recyclerViewVersion = "1.1.0"
recyclerViewVersion = "1.2.1"
}
3 changes: 3 additions & 0 deletions changelog.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
## 1.2.3
- updated target sdk version to 31

## 1.2.2

#### Fixes
Expand Down
3 changes: 2 additions & 1 deletion demo/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,8 @@
tools:ignore="GoogleAppIndexingWarning">
<activity
android:name="ru.tinkoff.scrollingpagerindicator.demo.MainActivity"
android:screenOrientation="portrait">
android:screenOrientation="portrait"
android:exported="true">
<intent-filter>
<action android:name="android.intent.action.MAIN" />

Expand Down
5 changes: 2 additions & 3 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -11,15 +11,14 @@
# The setting is particularly useful for tweaking memory settings.
org.gradle.jvmargs=-Xmx1536m

android.useAndroidX=true
# When configured, Gradle will run in incubating parallel mode.
# This option should only be used with decoupled projects. More details, visit
# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
# org.gradle.parallel=true
android.useAndroidX=true

VERSION_NAME=1.2.2
VERSION_CODE=12
VERSION_NAME=1.2.3
VERSION_CODE=13
GROUP=ru.tinkoff.scrollingpagerindicator

POM_DESCRIPTION=Pager indicator inspired by Instagram. Lightweight and easy to set up.
Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
Expand Up @@ -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.5-bin.zip

0 comments on commit 8213a4b

Please sign in to comment.