Merge pull request #476 from CameraKit/prereleases-module-consolidation

Prereleases module consolidation

Author: austinkettner

camerakit-core/.gitignore

@@ -17,11 +17,28 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
+    sourceSets {
+        main.java.srcDirs += 'src/main/base'
+        main.java.srcDirs += 'src/main/api16'
+        main.java.srcDirs += 'src/main/api21'
+        main.java.srcDirs += 'src/main/types'
+        main.java.srcDirs += 'src/main/events'
+        main.java.srcDirs += 'src/main/utils'
+        main.java.srcDirs += 'src/main/vision'
+    }
+    externalNativeBuild {
+        cmake {
+            path 'src/main/CMakeLists.txt'
+        }
+    }
 }
 
 dependencies {
-    api project(':camerakit-core')
-    api project(':camerakit-vision')
+    implementation 'com.android.support:appcompat-v7:28.0.0'
+    implementation 'com.android.support:support-media-compat:28.0.0'
+    implementation 'com.android.support:support-v4:28.0.0'
+    implementation 'com.android.support:exifinterface:28.0.0'
+    implementation 'com.google.android.gms:play-services-vision:17.0.2'
 }
 
 group = 'com.wonderkiln'

camerakit-core/build.gradle

@@ -1 +1,21 @@
-<manifest package="com.wonderkiln.camerakit"/>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.wonderkiln.camerakit.core">
+
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+    <uses-permission android:name="android.permission.CAMERA" />
+    <uses-permission android:name="android.permission.RECORD_AUDIO" />
+
+    <uses-feature android:name="android.hardware.camera" />
+    <uses-feature
+        android:name="android.hardware.camera.autofocus"
+        android:required="false" />
+    <uses-feature
+        android:name="android.hardware.camera.front"
+        android:required="false" />
+    <uses-feature
+        android:name="android.hardware.microphone"
+        android:required="false" />
+
+    <application />
+
+</manifest>

camerakit-core/proguard-rules.pro

@@ -9,8 +9,8 @@
 import android.os.Environment;
 import android.os.Handler;
 import android.os.Looper;
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
+import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
 import android.util.Log;
 
 import com.google.android.gms.vision.Detector;

camerakit-core/src/main/AndroidManifest.xml

@@ -3,7 +3,7 @@
 import android.annotation.TargetApi;
 import android.hardware.Camera;
 import android.hardware.camera2.CameraCharacteristics;
-import androidx.collection.SparseArrayCompat;
+import android.support.v4.util.SparseArrayCompat;
 import android.util.SparseIntArray;
 
 public class ConstantMapper {

camerakit-vision/.gitignore

@@ -1,6 +1,6 @@
 package com.wonderkiln.camerakit;
 
-import androidx.annotation.Nullable;
+import android.support.annotation.Nullable;
 
 import com.google.android.gms.vision.Detector;
 import com.google.android.gms.vision.text.TextBlock;

camerakit-vision/build.gradle

@@ -1,8 +1,8 @@
 package com.wonderkiln.camerakit;
 
 import android.content.Context;
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
+import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
 import android.util.AttributeSet;
 import android.view.GestureDetector;
 import android.view.MotionEvent;

camerakit-vision/proguard-rules.pro

@@ -1,8 +1,8 @@
 package com.wonderkiln.camerakit;
 
 import android.content.Context;
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
+import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
 import android.util.AttributeSet;
 import android.view.View;
 import android.widget.FrameLayout;

camerakit-vision/src/main/AndroidManifest.xml

@@ -1,6 +1,6 @@
 package com.wonderkiln.camerakit;
 
-import androidx.annotation.Nullable;
+import android.support.annotation.Nullable;
 
 public class CameraKitError extends CameraKitEvent {
 

camerakit/build.gradle

@@ -1,7 +1,7 @@
 package com.wonderkiln.camerakit;
 
 import android.os.Bundle;
-import androidx.annotation.NonNull;
+import android.support.annotation.NonNull;
 
 public class CameraKitEvent {
 

camerakit/proguard-rules.pro

@@ -2,7 +2,7 @@
 
 import android.os.Handler;
 import android.os.Looper;
-import androidx.annotation.NonNull;
+import android.support.annotation.NonNull;
 
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;

camerakit/src/main/AndroidManifest.xml

@@ -18,12 +18,12 @@
 import android.content.res.TypedArray;
 import android.os.Handler;
 import android.os.HandlerThread;
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.core.app.ActivityCompat;
-import androidx.core.content.ContextCompat;
-import androidx.core.hardware.display.DisplayManagerCompat;
-import androidx.core.view.ViewCompat;
+import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
+import android.support.v4.app.ActivityCompat;
+import android.support.v4.content.ContextCompat;
+import android.support.v4.hardware.display.DisplayManagerCompat;
+import android.support.v4.view.ViewCompat;
 import android.util.AttributeSet;
 import android.view.Display;
 import android.view.Surface;

camerakit-core/src/main/CMakeLists.txt renamed to camerakit/src/main/CMakeLists.txt

@@ -3,8 +3,8 @@
 import android.animation.Animator;
 import android.animation.AnimatorListenerAdapter;
 import android.content.Context;
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
+import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
 import android.util.AttributeSet;
 import android.view.LayoutInflater;
 import android.widget.FrameLayout;