Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

It compiles! (with 2019 Android Studio) #6

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
70 changes: 49 additions & 21 deletions app/build.gradle
Original file line number Diff line number Diff line change
@@ -1,27 +1,51 @@
apply plugin: 'com.android.model.application'
apply plugin: 'com.android.application'


model {
android {
compileSdkVersion 23
buildToolsVersion "25.0.0"
android {
compileSdkVersion 27
defaultConfig {
applicationId "io.rpng.calibration"

defaultConfig {
applicationId "io.rpng.calibration"
minSdkVersion.apiLevel 21
targetSdkVersion.apiLevel 23
versionCode 1
versionName "1.0"
// AR Optional apps must declare minSdkVersion >= 14.
// AR Required apps must declare minSdkVersion >= 24.
minSdkVersion 24
targetSdkVersion 27
versionCode 1
versionName "1.0"
ndk {
/*
* Sceneform is available for the following ABIs:
* 'arm64-v8a', 'armeabi-v7a', 'x86_64' and 'x86'.
* Your application should include the ABIs most appropriate to
* minimize APK size. Listing 'arm64-v8a' is recommended.
*
* This sample app includes two ABIs:
* 1. 'arm64-v8a' to run on devices
* 2. 'x86' to run in the Android emulator
*/
abiFilters 'arm64-v8a', 'x86'
}
buildTypes {
release {
minifyEnabled false
proguardFiles.add(file('proguard-rules.pro'))
}
}
// Sceneform libraries use language constructs from Java 8.
// Add these compile options if targeting minSdkVersion < 26.
compileOptions {
sourceCompatibility JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_1_8
}
buildTypes {
release {
minifyEnabled false
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
}
}

lintOptions {
abortOnError false
}
}



dependencies {
// Include the libs dir (right now we don't have any java libs)
//compile fileTree(dir: 'libs', include: ['*.jar'])
Expand All @@ -30,13 +54,17 @@ dependencies {
//testCompile 'junit:junit:4.12'

// Include opencv libraries
compile project(':opencv_310')
//implementation project(':opencv_310')
// opencv 3.4.4 with contribution packages
implementation 'com.quickbirdstudios:opencv:3.4.4-contrib'
implementation 'com.google.code.gson:gson:2.8.5'
implementation 'com.koushikdutta.async:androidasync:2.+'

// Include android deps
compile 'com.android.support:appcompat-v7:23.4.0'
compile 'com.android.support:design:23.4.0'
compile 'com.android.support:support-v4:23.3.0'
compile 'com.android.support:support-v13:23.3.0'
implementation "com.android.support:appcompat-v7:27.1.1"
implementation 'com.android.support:design:27.1.1'
//implementation 'com.android.support:support-v4:23.3.0'
implementation 'com.android.support:support-v13:27.1.1'

}

Expand Down
7 changes: 6 additions & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,14 @@

buildscript {
repositories {
google()
jcenter()
mavenLocal()
}
dependencies {
//classpath 'com.android.tools.build:gradle:2.1.2'
classpath 'com.android.tools.build:gradle-experimental:0.9.3'
//classpath 'com.android.tools.build:gradle-experimental:2.3.3'
classpath 'com.android.tools.build:gradle:3.5.0'

// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
Expand All @@ -15,7 +18,9 @@ buildscript {

allprojects {
repositories {
google()
jcenter()
mavenLocal()
}
}

Expand Down
4 changes: 2 additions & 2 deletions gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#Fri Jun 30 17:12:04 EDT 2017
#Tue Aug 20 14:27:00 CDT 2019
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip
4 changes: 0 additions & 4 deletions libraries/jpeg/.gitignore

This file was deleted.

11 changes: 0 additions & 11 deletions libraries/jpeg/ReadMe.md

This file was deleted.

46 changes: 0 additions & 46 deletions libraries/jpeg/build.gradle

This file was deleted.

70 changes: 0 additions & 70 deletions libraries/jpeg/src/main-old/jni/jconfig.h

This file was deleted.

Loading