From 05f3b5282e1c23939cbcbab570ae725e82a4765e Mon Sep 17 00:00:00 2001 From: Dylan McIntyre <dwillmc@gmail.com> Date: Mon, 27 Aug 2018 14:48:17 -0700 Subject: [PATCH] v1.0.0-beta3.6 --- build.gradle | 2 +- camerakit/src/main/cpp/jni_camera_surface_texture.cpp | 2 +- camerakit/src/main/cpp/jni_camera_surface_view.cpp | 2 +- .../src/main/java/com/camerakit/CameraKitView.java | 2 -- .../android => com/camerakit}/CameraPreview.kt | 10 +++++----- .../camerakit}/preview/CameraSurfaceTexture.kt | 2 +- .../camerakit}/preview/CameraSurfaceTextureListener.kt | 2 +- .../camerakit}/preview/CameraSurfaceView.kt | 2 +- .../camerakit}/util/CameraSizeCalculator.kt | 2 +- 9 files changed, 12 insertions(+), 14 deletions(-) rename camerakit/src/main/java/{camerakit/android => com/camerakit}/CameraPreview.kt (97%) rename camerakit/src/main/java/{camerakit/android => com/camerakit}/preview/CameraSurfaceTexture.kt (98%) rename camerakit/src/main/java/{camerakit/android => com/camerakit}/preview/CameraSurfaceTextureListener.kt (76%) rename camerakit/src/main/java/{camerakit/android => com/camerakit}/preview/CameraSurfaceView.kt (98%) rename camerakit/src/main/java/{camerakit/android => com/camerakit}/util/CameraSizeCalculator.kt (96%) diff --git a/build.gradle b/build.gradle index f1c250a79d..d8a4c562a4 100644 --- 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 index 6acbdfb971..82318c0d36 100644 --- 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 index de0b866c2d..426f2c3d66 100644 --- 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 index 96460290b7..b0ce8d9f54 100644 --- 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/camerakit/src/main/java/camerakit/android/CameraPreview.kt b/camerakit/src/main/java/com/camerakit/CameraPreview.kt similarity index 97% rename from camerakit/src/main/java/camerakit/android/CameraPreview.kt rename to camerakit/src/main/java/com/camerakit/CameraPreview.kt index bd75bb89a1..b90447c417 100644 --- a/camerakit/src/main/java/camerakit/android/CameraPreview.kt +++ b/camerakit/src/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/camerakit/src/main/java/camerakit/android/preview/CameraSurfaceTexture.kt b/camerakit/src/main/java/com/camerakit/preview/CameraSurfaceTexture.kt similarity index 98% rename from camerakit/src/main/java/camerakit/android/preview/CameraSurfaceTexture.kt rename to camerakit/src/main/java/com/camerakit/preview/CameraSurfaceTexture.kt index 5c14d96c52..a1c8cecd12 100644 --- a/camerakit/src/main/java/camerakit/android/preview/CameraSurfaceTexture.kt +++ b/camerakit/src/main/java/com/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/camerakit/src/main/java/camerakit/android/preview/CameraSurfaceTextureListener.kt b/camerakit/src/main/java/com/camerakit/preview/CameraSurfaceTextureListener.kt similarity index 76% rename from camerakit/src/main/java/camerakit/android/preview/CameraSurfaceTextureListener.kt rename to camerakit/src/main/java/com/camerakit/preview/CameraSurfaceTextureListener.kt index e7af2013e1..f4404f51d1 100644 --- a/camerakit/src/main/java/camerakit/android/preview/CameraSurfaceTextureListener.kt +++ b/camerakit/src/main/java/com/camerakit/preview/CameraSurfaceTextureListener.kt @@ -1,4 +1,4 @@ -package camerakit.android.preview +package com.camerakit.preview interface CameraSurfaceTextureListener { fun onSurfaceReady(cameraSurfaceTexture: CameraSurfaceTexture) diff --git a/camerakit/src/main/java/camerakit/android/preview/CameraSurfaceView.kt b/camerakit/src/main/java/com/camerakit/preview/CameraSurfaceView.kt similarity index 98% rename from camerakit/src/main/java/camerakit/android/preview/CameraSurfaceView.kt rename to camerakit/src/main/java/com/camerakit/preview/CameraSurfaceView.kt index 24099f8462..9ac203edf4 100644 --- a/camerakit/src/main/java/camerakit/android/preview/CameraSurfaceView.kt +++ b/camerakit/src/main/java/com/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/camerakit/src/main/java/camerakit/android/util/CameraSizeCalculator.kt b/camerakit/src/main/java/com/camerakit/util/CameraSizeCalculator.kt similarity index 96% rename from camerakit/src/main/java/camerakit/android/util/CameraSizeCalculator.kt rename to camerakit/src/main/java/com/camerakit/util/CameraSizeCalculator.kt index b2f60163aa..0133950e8b 100644 --- a/camerakit/src/main/java/camerakit/android/util/CameraSizeCalculator.kt +++ b/camerakit/src/main/java/com/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