v1.0.0-beta3.6

CameraKit · Aug 27, 2018 · 05f3b52 · 05f3b52
1 parent 7b8dfea
commit 05f3b52
Show file tree

Hide file tree

Showing 9 changed files with 12 additions and 14 deletions.
diff --git a/build.gradle b/build.gradle
@@ -13,7 +13,7 @@ buildscript {
 
 subprojects { project ->
     group = 'com.camerakit'
-    version = '1.0.0-beta3.5'
+    version = '1.0.0-beta3.6'
 
     repositories {
         google()

diff --git a/camerakit/src/main/cpp/jni_camera_surface_texture.cpp b/camerakit/src/main/cpp/jni_camera_surface_texture.cpp
@@ -76,7 +76,7 @@ namespace camerakit {
 
   namespace jni {
 
-    const char* const classPathName = "camerakit/android/preview/CameraSurfaceTexture";
+    const char* const classPathName = "com/camerakit/preview/CameraSurfaceTexture";
 
     static JNINativeMethod methods[] = {
         {"nativeInit",           "(II)V",   (void*) CameraSurfaceTexture_init},

diff --git a/camerakit/src/main/cpp/jni_camera_surface_view.cpp b/camerakit/src/main/cpp/jni_camera_surface_view.cpp
@@ -83,7 +83,7 @@ namespace camerakit {
 
   namespace jni {
 
-    const char* const classPathName = "camerakit/android/preview/CameraSurfaceView";
+    const char* const classPathName = "com/camerakit/preview/CameraSurfaceView";
 
     static JNINativeMethod methods[] = {
             {"nativeInit",             "()V",    (void*) CameraSurfaceView_init},

diff --git a/camerakit/src/main/java/com/camerakit/CameraKitView.java b/camerakit/src/main/java/com/camerakit/CameraKitView.java
@@ -26,8 +26,6 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import camerakit.android.CameraPreview;
-
 import static android.view.ViewGroup.LayoutParams.WRAP_CONTENT;
 
 /**

diff --git a/...n/java/camerakit/android/CameraPreview.kt → .../main/java/com/camerakit/CameraPreview.kt b/...n/java/camerakit/android/CameraPreview.kt → .../main/java/com/camerakit/CameraPreview.kt
@@ -1,14 +1,14 @@
-package camerakit.android
+package com.camerakit
 
 import android.content.Context
 import android.os.Build
 import android.util.AttributeSet
 import android.view.WindowManager
 import android.widget.FrameLayout
-import camerakit.android.preview.CameraSurfaceTexture
-import camerakit.android.preview.CameraSurfaceTextureListener
-import camerakit.android.preview.CameraSurfaceView
-import camerakit.android.util.CameraSizeCalculator
+import com.camerakit.preview.CameraSurfaceTexture
+import com.camerakit.preview.CameraSurfaceTextureListener
+import com.camerakit.preview.CameraSurfaceView
+import com.camerakit.util.CameraSizeCalculator
 import com.camerakit.api.CameraApi
 import com.camerakit.api.CameraAttributes
 import com.camerakit.api.CameraEvents

diff --git a/...t/android/preview/CameraSurfaceTexture.kt → ...camerakit/preview/CameraSurfaceTexture.kt b/...t/android/preview/CameraSurfaceTexture.kt → ...camerakit/preview/CameraSurfaceTexture.kt
@@ -1,4 +1,4 @@
-package camerakit.android.preview
+package com.camerakit.preview
 
 import android.graphics.SurfaceTexture
 import android.opengl.Matrix

diff --git a/...d/preview/CameraSurfaceTextureListener.kt → ...t/preview/CameraSurfaceTextureListener.kt b/...d/preview/CameraSurfaceTextureListener.kt → ...t/preview/CameraSurfaceTextureListener.kt
@@ -1,4 +1,4 @@
-package camerakit.android.preview
+package com.camerakit.preview
 
 interface CameraSurfaceTextureListener {
     fun onSurfaceReady(cameraSurfaceTexture: CameraSurfaceTexture)

diff --git a/...akit/android/preview/CameraSurfaceView.kt → ...om/camerakit/preview/CameraSurfaceView.kt b/...akit/android/preview/CameraSurfaceView.kt → ...om/camerakit/preview/CameraSurfaceView.kt
@@ -1,4 +1,4 @@
-package camerakit.android.preview
+package com.camerakit.preview
 
 import android.content.Context
 import android.opengl.GLES20.glGenTextures

diff --git a/...akit/android/util/CameraSizeCalculator.kt → ...om/camerakit/util/CameraSizeCalculator.kt b/...akit/android/util/CameraSizeCalculator.kt → ...om/camerakit/util/CameraSizeCalculator.kt
@@ -1,4 +1,4 @@
-package camerakit.android.util
+package com.camerakit.util
 
 import com.camerakit.type.CameraSize
 import kotlin.math.absoluteValue