Skip to content

Commit 3cf73a1

Browse files
authored
Merge pull request #42 from ka05/users/ka05/opencv-update-343
Users/ka05/opencv update 343
2 parents a32a3db + d9d68b0 commit 3cf73a1

File tree

165 files changed

+13409
-8309
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

165 files changed

+13409
-8309
lines changed

.idea/codeStyles/Project.xml

Lines changed: 116 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

app/build.gradle

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
apply plugin: 'com.android.application'
22

33
android {
4-
compileSdkVersion 26
4+
compileSdkVersion 29
55
defaultConfig {
66
applicationId "com.adityaarora.liveedgedetection"
7-
minSdkVersion 16
8-
targetSdkVersion 26
7+
minSdkVersion 21
8+
targetSdkVersion 29
99
versionCode 1
1010
versionName "1.0"
1111
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
@@ -21,8 +21,8 @@ android {
2121
dependencies {
2222
implementation fileTree(include: ['*.jar'], dir: 'libs')
2323
implementation 'com.android.support:appcompat-v7:26.1.0'
24-
implementation 'com.android.support.constraint:constraint-layout:1.1.2'
25-
testImplementation 'junit:junit:4.12'
24+
implementation 'com.android.support.constraint:constraint-layout:1.1.3'
25+
testImplementation 'junit:junit:4.13'
2626
androidTestImplementation 'com.android.support.test:runner:1.0.2'
2727
androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
2828
implementation project(':liveedgedetection')

build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ buildscript {
77
jcenter()
88
}
99
dependencies {
10-
classpath 'com.android.tools.build:gradle:3.1.3'
11-
classpath 'com.github.dcendents:android-maven-gradle-plugin:2.0'
10+
classpath 'com.android.tools.build:gradle:3.6.3'
11+
classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1'
1212

1313
// NOTE: Do not place your application dependencies here; they belong
1414
// in the individual module build.gradle files
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
#Wed Jul 11 10:51:54 BRT 2018
1+
#Tue Jun 02 13:25:31 EDT 2020
22
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-4.4-all.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-all.zip

liveedgedetection/build.gradle

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,12 @@ apply plugin: 'com.github.dcendents.android-maven'
33

44
group = 'com.github.adityaarora1'
55
android {
6-
compileSdkVersion 26
7-
6+
compileSdkVersion 29
87
packageBuildConfig false
98

10-
119
defaultConfig {
12-
minSdkVersion 16
13-
targetSdkVersion 26
10+
minSdkVersion 21
11+
targetSdkVersion 29
1412
versionCode 1
1513
versionName "1.0"
1614

@@ -28,14 +26,13 @@ android {
2826
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
2927
}
3028
}
31-
3229
}
3330

3431
dependencies {
3532
implementation fileTree(include: ['*.jar'], dir: 'libs')
3633
implementation 'com.android.support:appcompat-v7:26.1.0'
37-
testImplementation 'junit:junit:4.12'
38-
androidTestImplementation 'com.android.support.test:runner:1.0.1'
39-
androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.1'
40-
implementation project(':openCVLibrary340')
34+
testImplementation 'junit:junit:4.13'
35+
androidTestImplementation 'com.android.support.test:runner:1.0.2'
36+
androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
37+
implementation project(':openCVLibrary343')
4138
}

0 commit comments

Comments
 (0)