Skip to content

Commit

Permalink
Gradle 7.2
Browse files Browse the repository at this point in the history
  • Loading branch information
alexeyvasilyev committed Nov 3, 2021
1 parent 18e6a92 commit fc27754
Show file tree
Hide file tree
Showing 6 changed files with 40 additions and 37 deletions.
13 changes: 6 additions & 7 deletions app/build.gradle
Original file line number Diff line number Diff line change
@@ -1,16 +1,15 @@
apply from: '../constants.gradle'
apply plugin: 'com.android.application'
apply plugin: 'kotlin-android'
apply plugin: 'kotlin-android-extensions'

android {
compileSdkVersion 30
buildToolsVersion "30.0.3"
compileSdkVersion 31
buildToolsVersion "31.0.0"

defaultConfig {
applicationId "com.alexvas.timeline.demo"
minSdkVersion 21
targetSdkVersion 30
targetSdkVersion 31
versionCode 1
versionName "1.0"

Expand Down Expand Up @@ -42,9 +41,9 @@ dependencies {
implementation fileTree(dir: 'libs', include: ['*.jar'])
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:${kotlin_version}"
implementation "androidx.appcompat:appcompat:${androidXAppcompatVersion}"
implementation 'androidx.core:core-ktx:1.3.2'
implementation 'com.google.android.material:material:1.2.1'
implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
implementation 'androidx.core:core-ktx:1.7.0'
implementation 'com.google.android.material:material:1.4.0'
implementation 'androidx.constraintlayout:constraintlayout:2.1.1'
implementation 'androidx.lifecycle:lifecycle-extensions:2.2.0'
implementation "androidx.navigation:navigation-fragment:${androidXNavigationVersion}"
implementation "androidx.navigation:navigation-ui:${androidXNavigationVersion}"
Expand Down
4 changes: 2 additions & 2 deletions app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,15 @@
package="com.alexvas.timeline.demo">

<application
android:allowBackup="true"
android:icon="@mipmap/ic_launcher"
android:label="@string/app_name"
android:roundIcon="@mipmap/ic_launcher_round"
android:supportsRtl="true"
android:theme="@style/AppTheme">
<activity
android:name=".MainActivity"
android:label="@string/app_name">
android:label="@string/app_name"
android:exported="true">
<intent-filter>
<action android:name="android.intent.action.MAIN" />

Expand Down
13 changes: 8 additions & 5 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,20 +1,23 @@
buildscript {
ext.kotlin_version = '1.4.21'
ext.kotlin_version = '1.5.31'
ext.compile_sdk_version = 31
ext.min_sdk_version = 21
ext.target_sdk_version = 31
ext.project_version_code = 145
ext.project_version_name = '1.4.5'

repositories {
jcenter()
google()
mavenCentral()
}
dependencies {
classpath 'com.android.tools.build:gradle:4.1.1'
classpath 'com.android.tools.build:gradle:7.0.3'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1'
}
}

allprojects {
repositories {
jcenter()
google()
mavenCentral()
}
Expand Down
11 changes: 2 additions & 9 deletions constants.gradle
Original file line number Diff line number Diff line change
@@ -1,12 +1,5 @@
project.ext {
compileSdkVersion = 30
buildToolsVersion = '30.0.3'
minSdkVersion = 21 // 5.0
targetSdkVersion = 30 // 11.0
releaseVersion = "1.4.4"
releaseVersionCode = 144

androidXAnnotationVersion = '1.1.0'
androidXAppcompatVersion = '1.2.0'
androidXAnnotationVersion = '1.2.0'
androidXAppcompatVersion = '1.3.1'
androidXNavigationVersion = '2.3.2'
}
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.7.1-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-all.zip
34 changes: 21 additions & 13 deletions library-timeline/build.gradle
Original file line number Diff line number Diff line change
@@ -1,22 +1,30 @@
plugins {
id 'com.android.library'
id 'kotlin-android'
id 'maven-publish'
}

apply from: '../constants.gradle'
apply plugin: 'com.android.library'
apply plugin: 'com.github.dcendents.android-maven'
group = 'com.github.alexeyvasilyev'

project.afterEvaluate {
publishing {
publications {
release(MavenPublication) {
from components.release
}
}
}
}

android {
compileSdkVersion project.ext.compileSdkVersion
buildToolsVersion project.ext.buildToolsVersion
compileSdkVersion compile_sdk_version

defaultConfig {
minSdkVersion project.ext.minSdkVersion
targetSdkVersion project.ext.targetSdkVersion
versionName project.ext.releaseVersion
versionCode project.ext.releaseVersionCode
}

compileOptions {
sourceCompatibility JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_1_8
minSdkVersion min_sdk_version
targetSdkVersion target_sdk_version
versionCode project_version_code
versionName project_version_name
}
}

Expand Down

0 comments on commit fc27754

Please sign in to comment.