diff --git a/README.md b/README.md index 7bed26ade..fe354c321 100644 --- a/README.md +++ b/README.md @@ -25,7 +25,7 @@ The `tess-two-test` subdirectory contains Android JUnit tests. ## Pre-requisites -* Android 2.2 or higher +* Android 2.3 or higher * A v3.02+ [trained data file][tessdata] for a language. Data files must be extracted to the Android device in a subdirectory named `tessdata`. diff --git a/eyes-two/AndroidManifest.xml b/eyes-two/AndroidManifest.xml index 16a5f1a5f..34860418e 100644 --- a/eyes-two/AndroidManifest.xml +++ b/eyes-two/AndroidManifest.xml @@ -115,7 +115,7 @@ diff --git a/eyes-two/build.gradle b/eyes-two/build.gradle index 959b2dbf2..3cee052e7 100644 --- a/eyes-two/build.gradle +++ b/eyes-two/build.gradle @@ -7,7 +7,7 @@ android { buildToolsVersion "23.0.2" defaultConfig { - minSdkVersion 8 + minSdkVersion 9 targetSdkVersion 23 versionCode 1 versionName "1.0" diff --git a/tess-two/AndroidManifest.xml b/tess-two/AndroidManifest.xml index 28c3b9202..a16779ae7 100644 --- a/tess-two/AndroidManifest.xml +++ b/tess-two/AndroidManifest.xml @@ -20,7 +20,7 @@ android:versionName="1.0" > - \ No newline at end of file + diff --git a/tess-two/build.gradle b/tess-two/build.gradle index fe305c5f3..1b0d01b4b 100644 --- a/tess-two/build.gradle +++ b/tess-two/build.gradle @@ -1,13 +1,15 @@ import org.apache.tools.ant.taskdefs.condition.Os apply plugin: 'com.android.library' +apply plugin: 'com.github.dcendents.android-maven' +apply plugin: 'com.jfrog.bintray' android { compileSdkVersion Integer.parseInt(project.ANDROID_BUILD_SDK_VERSION) buildToolsVersion project.ANDROID_BUILD_TOOLS_VERSION defaultConfig { - minSdkVersion 8 + minSdkVersion 9 targetSdkVersion 23 versionCode 1 versionName "1.0" @@ -57,4 +59,76 @@ android { dependencies { compile fileTree(dir: 'libs', include: ['*.jar']) -} \ No newline at end of file +} + + +// Settings for uploading module AAR to Bintray for library distribution + +task sourcesJar(type: Jar) { + from android.sourceSets.main.java.srcDirs + classifier = 'sources' +} + +task javadoc(type: Javadoc) { + source = android.sourceSets.main.java.srcDirs + classpath += project.files(android.getBootClasspath().join(File.pathSeparator)) + options { + links "http://docs.oracle.com/javase/7/docs/api/" + linksOffline "http://d.android.com/reference","${android.sdkDirectory}/docs/reference" + } +} + +task javadocJar(type: Jar, dependsOn: javadoc) { + classifier = 'javadoc' + from javadoc.destinationDir +} + +artifacts { + archives javadocJar + archives sourcesJar +} + +install { + repositories.mavenInstaller { + pom.project { + name = 'tess-two' + + packaging = 'aar' + groupId = 'com.rmtheis' + artifactId = 'tess-two' + + developers { + developer { + id = 'rmtheis' + name = 'Robert Theis' + email = 'robert.m.theis@gmail.com' + } + } + licenses { + license { + name = 'The Apache Software License, Version 2.0' + url = 'http://www.apache.org/licenses/LICENSE-2.0.txt' + distribution = 'repo' + } + } + scm { + url 'https://github.com/rmtheis/tess-two' + } + } + } +} + +Properties properties = new Properties() +properties.load(project.rootProject.file('local.properties').newDataInputStream()) + +bintray { + user = properties.getProperty("bintray.user") + key = properties.getProperty("bintray.apikey") + configurations = ['archives'] + pkg { + repo = 'maven' + name = 'tess-two' + userOrg = user + publish = true + } +} diff --git a/tess-two/jni/Application.mk b/tess-two/jni/Application.mk index dda832a65..bba3edcf6 100644 --- a/tess-two/jni/Application.mk +++ b/tess-two/jni/Application.mk @@ -1,6 +1,6 @@ APP_STL := gnustl_static APP_ABI := armeabi-v7a #x86 mips arm64-v8a x86_64 mips64 APP_OPTIM := release -APP_PLATFORM := android-8 +APP_PLATFORM := android-9 APP_CPPFLAGS += -fexceptions -frtti NDK_TOOLCHAIN_VERSION := clang