Skip to content

Commit 1ae86c4

Browse files
Merge pull request #476 from CameraKit/prereleases-module-consolidation
Prereleases module consolidation
2 parents 269ac0e + 775614c commit 1ae86c4

File tree

101 files changed

+88
-316
lines changed

Some content is hidden

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

101 files changed

+88
-316
lines changed

camerakit-core/.gitignore

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

camerakit-core/build.gradle

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

camerakit-core/proguard-rules.pro

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

camerakit-core/src/main/AndroidManifest.xml

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

camerakit-vision/.gitignore

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

camerakit-vision/build.gradle

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

camerakit-vision/proguard-rules.pro

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

camerakit-vision/src/main/AndroidManifest.xml

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

camerakit/build.gradle

Lines changed: 19 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,28 @@ android {
1717
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
1818
}
1919
}
20+
sourceSets {
21+
main.java.srcDirs += 'src/main/base'
22+
main.java.srcDirs += 'src/main/api16'
23+
main.java.srcDirs += 'src/main/api21'
24+
main.java.srcDirs += 'src/main/types'
25+
main.java.srcDirs += 'src/main/events'
26+
main.java.srcDirs += 'src/main/utils'
27+
main.java.srcDirs += 'src/main/vision'
28+
}
29+
externalNativeBuild {
30+
cmake {
31+
path 'src/main/CMakeLists.txt'
32+
}
33+
}
2034
}
2135

2236
dependencies {
23-
api project(':camerakit-core')
24-
api project(':camerakit-vision')
37+
implementation 'com.android.support:appcompat-v7:28.0.0'
38+
implementation 'com.android.support:support-media-compat:28.0.0'
39+
implementation 'com.android.support:support-v4:28.0.0'
40+
implementation 'com.android.support:exifinterface:28.0.0'
41+
implementation 'com.google.android.gms:play-services-vision:17.0.2'
2542
}
2643

2744
group = 'com.wonderkiln'

camerakit/proguard-rules.pro

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

0 commit comments

Comments
 (0)