Skip to content

Commit d7b3fe6

Browse files
authored
Merge pull request #261 from Countly/fix_root_build_gradle
fix: root build gradle
2 parents 1ecbd4a + 10001b1 commit d7b3fe6

File tree

3 files changed

+27
-31
lines changed

3 files changed

+27
-31
lines changed

CHANGELOG.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,13 @@
1+
## 24.1.4
2+
3+
* Cleaned up unused gradle dependencies from root build.gradle.
4+
15
## 24.1.3
26

37
* Extended minimum JDK support to 8.
48

59
## 24.1.2
10+
611
* !! Major Breaking Change !! Minimum JDK support is 19 for this minor.
712

813
* Migrated from Sonatype OSSRH.
@@ -214,3 +219,4 @@
214219

215220
* initial SDK release
216221
* MavenCentral rerelease
222+

build.gradle

Lines changed: 13 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,37 +1,21 @@
11
// Top-level build file where you can add configuration options common to all sub-projects/modules.
22

33
buildscript {
4-
repositories {
5-
google()
6-
mavenCentral()
7-
jcenter()
8-
maven {
9-
url "https://maven.google.com"
10-
}
11-
}
12-
dependencies {
13-
classpath 'com.android.tools.build:gradle:8.1.4'
14-
classpath 'com.github.dcendents:android-maven-plugin:1.2'
15-
classpath 'com.google.gms:google-services:4.4.2'
16-
17-
// NOTE: Do not place your application dependencies here; they belong
18-
// in the individual module build.gradle files
19-
}
4+
repositories {
5+
google()
6+
mavenCentral()
7+
}
208
}
219

2210
allprojects {
23-
ext.CLY_VERSION = "24.1.3"
24-
ext.POWERMOCK_VERSION = "1.7.4"
11+
ext.CLY_VERSION = "24.1.3"
12+
ext.POWERMOCK_VERSION = "1.7.4"
2513

26-
tasks.withType(Javadoc) {
27-
options.addStringOption('Xdoclint:none', '-quiet')
28-
}
29-
repositories {
30-
google()
31-
jcenter()
32-
//mavenLocal()
33-
maven {
34-
url "https://maven.google.com" // Google's Maven repository
35-
}
36-
}
14+
tasks.withType(Javadoc) {
15+
options.addStringOption('Xdoclint:none', '-quiet')
16+
}
17+
repositories {
18+
google()
19+
mavenCentral()
20+
}
3721
}

sdk-java/build.gradle

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,11 @@ buildscript {
88
//mavenLocal()
99
}
1010
dependencies {
11-
classpath 'com.vanniktech:gradle-maven-publish-plugin:0.28.0' //for publishing
11+
// Load publish plugin ONLY when publish task is requested
12+
if (gradle.startParameter.taskNames.any { it.toLowerCase().contains("publish") }) {
13+
// This requires minimum java 11 to work
14+
classpath 'com.vanniktech:gradle-maven-publish-plugin:0.28.0'
15+
}
1216
}
1317
}
1418

@@ -28,4 +32,6 @@ dependencies {
2832
//testImplementation 'com.squareup.okhttp3:mockwebserver:3.7.0'
2933
}
3034

31-
apply plugin: "com.vanniktech.maven.publish"
35+
if (gradle.startParameter.taskNames.any { it.toLowerCase().contains("publish") }) {
36+
apply plugin: "com.vanniktech.maven.publish"
37+
}

0 commit comments

Comments
 (0)