Skip to content

Commit

Permalink
Remove Android 2.2 support. Closes rmtheis#138.
Browse files Browse the repository at this point in the history
  • Loading branch information
rmtheis authored and brnhffmnn committed May 31, 2016
1 parent 1f7dbb7 commit a39cb85
Show file tree
Hide file tree
Showing 6 changed files with 82 additions and 8 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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`.

Expand Down
2 changes: 1 addition & 1 deletion eyes-two/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@
</activity>
</application>
<uses-sdk
android:minSdkVersion="8"
android:minSdkVersion="9"
android:targetSdkVersion="23" />
<uses-permission android:name="android.permission.CAMERA"/>
<uses-permission android:name="android.permission.INTERNET" />
Expand Down
2 changes: 1 addition & 1 deletion eyes-two/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ android {
buildToolsVersion "23.0.2"

defaultConfig {
minSdkVersion 8
minSdkVersion 9
targetSdkVersion 23
versionCode 1
versionName "1.0"
Expand Down
4 changes: 2 additions & 2 deletions tess-two/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
android:versionName="1.0" >

<uses-sdk
android:minSdkVersion="8"
android:minSdkVersion="9"
android:targetSdkVersion="23" />

</manifest>
</manifest>
78 changes: 76 additions & 2 deletions tess-two/build.gradle
Original file line number Diff line number Diff line change
@@ -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"
Expand Down Expand Up @@ -57,4 +59,76 @@ android {

dependencies {
compile fileTree(dir: 'libs', include: ['*.jar'])
}
}


// 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 = '[email protected]'
}
}
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
}
}
2 changes: 1 addition & 1 deletion tess-two/jni/Application.mk
Original file line number Diff line number Diff line change
@@ -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

0 comments on commit a39cb85

Please sign in to comment.