Skip to content

Commit 4dfeca2

Browse files
committed
Update gradle and targetsdk versions
1 parent 34ed9a4 commit 4dfeca2

File tree

7 files changed

+26
-11
lines changed

7 files changed

+26
-11
lines changed

afero-sdk-android/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@
55
apply plugin: 'com.android.library'
66

77
android {
8-
compileSdkVersion 26
8+
compileSdkVersion 30
99

1010
defaultConfig {
1111
minSdkVersion 19
12-
targetSdkVersion 26
12+
targetSdkVersion 30
1313
versionCode 1
1414
versionName rootProject.version
1515
}

afero-sdk-softhub/build.gradle

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,14 @@ repositories {
88
maven {
99
url "https://afero.jfrog.io/afero/hubby-android"
1010
credentials {
11-
username = project.aferoArtifactoryUserName
12-
password = project.aferoArtifactoryPassword
11+
username project.aferoArtifactoryUserName
12+
password project.aferoArtifactoryPassword
13+
}
14+
authentication {
15+
basic(BasicAuthentication)
16+
}
17+
metadataSources {
18+
artifact()
1319
}
1420
}
1521
}
@@ -18,11 +24,11 @@ final String hubbyVersion = "1.0.957"
1824
final String hubType = project.findProperty('aferoSofthubType') ?: '"CONSUMER"'
1925

2026
android {
21-
compileSdkVersion 26
27+
compileSdkVersion 30
2228

2329
defaultConfig {
2430
minSdkVersion 19
25-
targetSdkVersion 26
31+
targetSdkVersion 30
2632

2733
versionCode 1
2834
versionName rootProject.version

build.gradle

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ buildscript {
1010
}
1111
dependencies {
1212
classpath 'com.android.tools.build:gradle:3.4.0'
13-
classpath "org.jfrog.buildinfo:build-info-extractor-gradle:4.8.1"
13+
classpath 'org.jfrog.buildinfo:build-info-extractor-gradle:4.15.2'
1414
classpath "com.mobbeel.plugin:fat-aar:2.0.1"
1515
}
1616
}
@@ -19,6 +19,7 @@ allprojects {
1919
repositories {
2020
google()
2121
jcenter()
22+
mavenCentral()
2223
}
2324

2425
apply plugin: 'com.jfrog.artifactory'

gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-5.1.1-all.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-6.4-all.zip

samples/afero-lab/app/build.gradle

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,17 @@ final String sdkVersion = project.findProperty('aferoSDKVersion') ?: '1.5.0'
1010
repositories {
1111
maven {
1212
url "https://afero.jfrog.io/afero/${sdkRepoKey}"
13-
artifactUrls "https://afero.jfrog.io/afero/hubby-android"
13+
artifactUrls "https://afero.jfrog.io/artifactory/hubby-android"
1414
credentials {
1515
username = project.aferoArtifactoryUserName
1616
password = project.aferoArtifactoryPassword
1717
}
18+
authentication {
19+
basic(BasicAuthentication)
20+
}
21+
metadataSources {
22+
artifact()
23+
}
1824
}
1925
}
2026
configurations.all {

samples/afero-lab/build.gradle

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,10 @@ buildscript {
88
repositories {
99
google()
1010
jcenter()
11+
mavenCentral()
1112
}
1213
dependencies {
13-
classpath 'com.android.tools.build:gradle:3.6.1'
14+
classpath 'com.android.tools.build:gradle:3.6.3'
1415

1516
// NOTE: Do not place your application dependencies here; they belong
1617
// in the individual module build.gradle files
@@ -21,6 +22,7 @@ allprojects {
2122
repositories {
2223
google()
2324
jcenter()
25+
mavenCentral()
2426
}
2527
}
2628

samples/afero-lab/gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-all.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-6.4-all.zip

0 commit comments

Comments
 (0)