Skip to content

Commit fbb0e34

Browse files
committed
refact: replace bintray's gradle plugin
1 parent 0313ee1 commit fbb0e34

File tree

6 files changed

+38
-51
lines changed

6 files changed

+38
-51
lines changed

build.gradle

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,22 +3,22 @@ buildscript {
33

44
repositories {
55
google()
6-
jcenter()
76
mavenCentral()
7+
jcenter()
88
}
99
dependencies {
1010
classpath 'com.android.tools.build:gradle:4.1.2'
1111
classpath "com.github.ben-manes:gradle-versions-plugin:$benManes"
12-
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlins"
13-
classpath "org.jetbrains.dokka:dokka-android-gradle-plugin:$dokka"
14-
classpath "com.jfrog.bintray.gradle:gradle-bintray-plugin:$bintray"
15-
classpath "com.github.dcendents:android-maven-gradle-plugin:$maven"
12+
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin"
13+
classpath "com.vanniktech:gradle-maven-publish-plugin:$mavenpublish"
14+
classpath "org.jetbrains.dokka:dokka-gradle-plugin:$dokka"
1615
}
1716
}
1817

1918
allprojects {
2019
repositories {
2120
google()
21+
mavenCentral()
2222
jcenter()
2323
}
2424
buildscript {

dependency.gradle

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -14,24 +14,21 @@ ext.with {
1414
constraintLayout = '2.0.4'
1515
espresso = '3.3.0'
1616

17-
kotlins = '1.4.31'
18-
dokka = '0.9.17'
17+
kotlin = '1.4.31'
18+
dokka = '1.4.20'
1919

20-
bintray = '1.8.4'
21-
maven = '2.1'
20+
mavenpublish = '0.14.2'
2221

2322
junit = '4.12'
2423
test = '1.3.0'
2524
testExt = '1.1.2'
2625

27-
voice = '1.+'
28-
2926
leakcanary = '2.6'
3027

3128
dependency_jvm = [
32-
kotlin_stdlib : "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlins",
33-
kotlin_test : "org.jetbrains.kotlin:kotlin-test:$kotlins",
34-
kotlin_test_junit: "org.jetbrains.kotlin:kotlin-test-junit:$kotlins"
29+
kotlin_stdlib : "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin",
30+
kotlin_test : "org.jetbrains.kotlin:kotlin-test:$kotlin",
31+
kotlin_test_junit: "org.jetbrains.kotlin:kotlin-test-junit:$kotlin"
3532
]
3633
dependency_android = [
3734
appcompat : "androidx.appcompat:appcompat:$appcompat",
@@ -42,7 +39,6 @@ ext.with {
4239
test_rules : "androidx.test:rules:$test",
4340
test_runner : "androidx.test:runner:$test",
4441
test_ext_junit : "androidx.test.ext:junit:$testExt",
45-
voice : "com.algolia.instantsearch:voice:$voice",
4642
leakcanary : "com.squareup.leakcanary:leakcanary-android:$leakcanary"
4743
]
4844
}

gradle.properties

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,3 +12,18 @@ org.gradle.jvmargs=-Xmx1536m
1212
# This option should only be used with decoupled projects. More details, visit
1313
# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
1414
# org.gradle.parallel=true
15+
16+
# POM
17+
GROUP=com.algolia.instantsearch
18+
VERSION_NAME=1.1.0
19+
POM_DESCRIPTION=An overlay that gets your user's voice permission and input as text
20+
POM_URL=https://github.com/algolia/voice-overlay-android
21+
POM_SCM_URL=https://github.com/algolia/voice-overlay-android
22+
POM_SCM_CONNECTION=scm:git:git://github.com/algolia/voice-overlay-android.git
23+
POM_SCM_DEV_CONNECTION=scm:git:ssh://github.com/algolia/voice-overlay-android.git
24+
POM_LICENCE_NAME=MIT
25+
POM_LICENCE_URL=http://www.opensource.org/licenses/mit-license.php
26+
POM_LICENCE_DIST=repo
27+
POM_DEVELOPER_ID=algolia
28+
POM_DEVELOPER_NAME=The Algolia Team
29+
POM_DEVELOPER_EMAIL=[email protected]

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-6.5-all.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-6.6-all.zip

voice/build.gradle

Lines changed: 9 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
11
apply plugin: 'com.android.library'
22
apply plugin: 'kotlin-android'
3-
apply plugin: 'maven'
4-
apply plugin: 'maven-publish'
5-
apply plugin: 'com.github.dcendents.android-maven'
6-
apply plugin: 'org.jetbrains.dokka-android'
3+
apply plugin: 'com.vanniktech.maven.publish'
74

85
ext {
96
GROUP = 'com.algolia.instantsearch'
@@ -19,7 +16,7 @@ ext {
1916
LICENSE = 'MIT'
2017
LICENSE_URL = "http://www.opensource.org/licenses/mit-license.php"
2118

22-
VERSION = '1.0.0'
19+
VERSION = '1.1.0'
2320
VERSION_DESC = "$NAME - v$VERSION"
2421
}
2522

@@ -68,34 +65,11 @@ dependencies {
6865
testImplementation dependency_jvm.kotlin_test_junit
6966
}
7067

71-
dokka {
72-
reportUndocumented = false
73-
outputFormat = 'html'
74-
outputDirectory = "$buildDir/javadoc"
75-
}
76-
77-
tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).all {
78-
kotlinOptions.freeCompilerArgs += ['-module-name', GROUP + "." + BASENAME]
79-
}
80-
81-
task sourcesJar(type: Jar) {
82-
dependsOn "assembleRelease"
83-
classifier "sources"
84-
from android.sourceSets.main.java.srcDirs
85-
}
86-
87-
task javadocJar(type: Jar, dependsOn: dokka) {
88-
classifier "javadoc"
89-
from "$buildDir/javadoc"
90-
}
91-
92-
// add sources jar tasks as artifacts
93-
artifacts {
94-
archives sourcesJar
95-
archives javadocJar
96-
archives file: new File("${project.buildDir}/outputs/aar/${project.name}-release.aar"),
97-
name: "${project.name}-release.aar",
98-
type: "aar"
99-
}
68+
//tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).all {
69+
// kotlinOptions.freeCompilerArgs += ['-module-name', GROUP + "." + BASENAME]
70+
//}
10071

101-
apply from: "https://raw.githubusercontent.com/algolia/instantsearch-mobile-tools/7b9e6e1cc28f12497b88b6868ab99d5884f7c86b/gradle/bintrayv.gradle"
72+
//task javadocJar(type: Jar, dependsOn: dokka) {
73+
// classifier "javadoc"
74+
// from "$buildDir/javadoc"
75+
//}

voice/gradle.properties

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
POM_NAME=InstantSearch Android Voice
2+
POM_ARTIFACT_ID=voice

0 commit comments

Comments
 (0)