Skip to content

Commit da6e06d

Browse files
authored
Merge pull request #23 from hannesa2/BumpGradle
Modernize
2 parents 19d4ad0 + c71494e commit da6e06d

File tree

8 files changed

+117
-94
lines changed

8 files changed

+117
-94
lines changed
Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
name: "Validate Gradle Wrapper"
2+
on:
3+
push:
4+
branches:
5+
- master
6+
pull_request:
7+
branches:
8+
- master
9+
10+
jobs:
11+
validation:
12+
name: "Validation"
13+
runs-on: ubuntu-latest
14+
steps:
15+
- uses: actions/[email protected]
16+
- uses: gradle/wrapper-validation-action@v1

build.gradle

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,20 @@
11
buildscript {
2-
ext.kotlin_version = "1.4.10"
2+
ext.kotlin_version = "1.5.0"
33
repositories {
44
google()
5-
jcenter()
65
mavenCentral()
76
}
87
dependencies {
9-
classpath "com.android.tools.build:gradle:4.2.0-alpha14"
8+
classpath 'com.android.tools.build:gradle:4.2.1'
109
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
1110
}
1211
}
1312

1413
allprojects {
1514
repositories {
16-
mavenCentral()
1715
google()
1816
maven { url "https://jitpack.io" }
19-
jcenter()
17+
mavenCentral()
2018
}
2119
}
2220

gradle/wrapper/gradle-wrapper.jar

9.09 KB
Binary file not shown.
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-6.9-bin.zip
34
zipStoreBase=GRADLE_USER_HOME
45
zipStorePath=wrapper/dists
5-
distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-rc-4-bin.zip

gradlew

Lines changed: 69 additions & 48 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

gradlew.bat

Lines changed: 26 additions & 27 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

library/.gitignore

Lines changed: 0 additions & 1 deletion
This file was deleted.

library/build.gradle

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,6 @@ plugins {
44
id 'maven-publish'
55
}
66

7-
repositories {
8-
mavenCentral()
9-
google()
10-
jcenter()
11-
maven { url "https://jitpack.io" }
12-
}
13-
147
group = 'com.github.jitpack'
158
version = '1.0'
169

@@ -30,10 +23,7 @@ android {
3023
proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
3124
}
3225
}
33-
compileOptions {
34-
sourceCompatibility JavaVersion.VERSION_1_8
35-
targetCompatibility JavaVersion.VERSION_1_8
36-
}
26+
3727
kotlinOptions {
3828
jvmTarget = '1.8'
3929
}
@@ -43,7 +33,7 @@ dependencies {
4333
implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
4434
implementation 'androidx.core:core-ktx:1.3.2'
4535
implementation 'androidx.appcompat:appcompat:1.2.0'
46-
implementation 'com.google.android.material:material:1.2.1'
36+
implementation 'com.google.android.material:material:1.3.0'
4737
}
4838

4939
afterEvaluate {

0 commit comments

Comments
 (0)