Skip to content

Commit 19e3a9b

Browse files
committed
Merge voice and voice-ui module
1 parent 50bb93f commit 19e3a9b

37 files changed

+23
-136
lines changed

app/build.gradle

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,10 @@ android {
2323
}
2424
}
2525

26+
27+
2628
dependencies {
27-
implementation project(':voice-ui')
29+
implementation project(':voice')
2830

2931
implementation dependency_jvm.kotlin_stdlib
3032

build.gradle

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ buildscript {
77
mavenCentral()
88
}
99
dependencies {
10-
classpath 'com.android.tools.build:gradle:3.3.0-alpha11'
10+
classpath 'com.android.tools.build:gradle:3.3.0-alpha12'
1111
classpath "com.github.ben-manes:gradle-versions-plugin:$benManes"
1212
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlins"
1313
classpath "org.jetbrains.dokka:dokka-android-gradle-plugin:$dokka"
@@ -20,6 +20,9 @@ allprojects {
2020
repositories {
2121
google()
2222
jcenter()
23+
maven {
24+
url 'https://dl.bintray.com/algolia/maven'
25+
}
2326
}
2427
buildscript {
2528
apply plugin: 'com.github.ben-manes.versions'

dependency.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ ext.with {
2323
junit = '4.12'
2424
test = '1.0.2'
2525

26-
voice = '1.0.0-beta01'
26+
voice = '1.0.0-beta02'
2727

2828
dependency_jvm = [
2929
kotlin_stdlib : "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlins",

settings.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
include ':app', ':voice', ':voice-ui'
1+
include ':app', ':voice'

voice-ui/.gitignore

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

voice-ui/build.gradle

Lines changed: 0 additions & 100 deletions
This file was deleted.

voice-ui/proguard-rules.pro

Lines changed: 0 additions & 21 deletions
This file was deleted.

voice-ui/src/main/AndroidManifest.xml

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

voice/build.gradle

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,16 +11,16 @@ ext {
1111
BASENAME = 'voice'
1212
CODENAME = "$GROUP:$BASENAME"
1313
NAME = 'InstantSearch Android Voice'
14-
DESC = "A library that gets your user’s voice permission and input as text."
15-
LABELS = ["voice search", "voice input", "permissions"]
14+
DESC = "An overlay that gets your user’s voice permission and input as text."
15+
LABELS = ["voice search", "voice input", "permissions", "voice UI"]
1616

1717
GITHUB = "algolia/voice-overlay-android"
1818
WEBSITE = "https://github.com/$GITHUB"
1919
REPO = WEBSITE + ".git"
2020
LICENSE = 'MIT'
2121
LICENSE_URL = "http://www.opensource.org/licenses/mit-license.php"
2222

23-
VERSION = '1.0.0-beta01'
23+
VERSION = '1.0.0-beta02'
2424
VERSION_DESC = "$NAME - v$VERSION"
2525
}
2626

@@ -53,6 +53,10 @@ android {
5353
dependencies {
5454
implementation dependency_jvm.kotlin_stdlib
5555

56+
implementation dependency_android.appcompat
57+
implementation dependency_android.constraint_layout
58+
implementation dependency_android.design
59+
5660
androidTestImplementation dependency_android.espresso
5761
androidTestImplementation dependency_jvm.kotlin_test
5862
androidTestImplementation dependency_jvm.kotlin_test_junit

voice-ui/src/main/kotlin/com/algolia/instantsearch/voice/ui/DrawableSprite.kt renamed to voice/src/main/kotlin/com/algolia/instantsearch/voice/ui/DrawableSprite.kt

File renamed without changes.

0 commit comments

Comments
 (0)