Build updates

Author: dwillmc

app/CMakeLists.txt

@@ -0,0 +1,8 @@
+cmake_minimum_required(VERSION 3.4.1)
+
+add_library(demo SHARED src/main/cpp/demo.cpp)
+
+find_library(log-lib log)
+find_library(android-lib android)
+
+target_link_libraries(demo ${log-lib} ${android-lib})

app/build.gradle

@@ -1,17 +1,35 @@
-apply plugin: 'com.android.application'
+plugins {
+    id 'com.android.application'
+}
 
 android {
-    compileSdkVersion 26
+    compileSdkVersion = 27
+    buildToolsVersion = '27.0.3'
     defaultConfig {
         applicationId 'com.jpegkit.app'
         minSdkVersion 15
-        targetSdkVersion 26
+        targetSdkVersion 27
         versionCode 1
-        versionName '0.1.0'
+        versionName '0.2.0'
+        externalNativeBuild {
+            cmake {
+                cppFlags ''
+            }
+        }
+    }
+    externalNativeBuild {
+        cmake {
+            path 'CMakeLists.txt'
+        }
     }
 }
 
+repositories {
+    jcenter()
+    google()
+}
+
 dependencies {
     implementation project(':jpegkit')
-    implementation 'com.android.support:appcompat-v7:26.1.0'
+    implementation 'com.android.support:appcompat-v7:27.1.1'
 }

app/src/main/cpp/demo.cpp

@@ -0,0 +1,5 @@
+#include <jni.h>
+
+extern "C" JNIEXPORT void JNICALL
+Java_com_jpegkit_app_MainActivity_init(JNIEnv *env, jobject obj) {
+}

build.gradle

@@ -1,26 +1,9 @@
-ext {
-    compileSdkVersion = 27
-    buildToolsVersion = '27.0.0'
-
-    minSdkVersion = 15
-    targetSdkVersion = 27
-}
-
-
 buildscript {
     repositories {
         google()
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.0.1'
-    }
-}
-
-
-allprojects {
-    repositories {
-        google()
-        jcenter()
+        classpath 'com.android.tools.build:gradle:3.1.2'
     }
 }

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Mon Jan 22 05:18:53 EST 2018
+#Mon Jun 11 14:39:14 EDT 2018
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip

jpegkit/src/main/CMakeLists.txt jpegkit/CMakeLists.txtjpegkit/src/main/CMakeLists.txt renamed to jpegkit/CMakeLists.txt

@@ -1,13 +1,13 @@
 cmake_minimum_required(VERSION 3.4.1)
 
-set(JPEG_INC_DIR ${CMAKE_SOURCE_DIR}/cpp/libjpeg/include)
-set(JPEG_BUILD_DIR ${CMAKE_SOURCE_DIR}/jniLibs)
+set(JPEG_INC_DIR ${CMAKE_SOURCE_DIR}/src/main/cpp/libjpeg/include)
+set(JPEG_BUILD_DIR ${CMAKE_SOURCE_DIR}/src/main/jniLibs)
 
 include_directories(${JPEG_INC_DIR})
 
 add_library(libjpeg STATIC IMPORTED)
 set_target_properties(libjpeg PROPERTIES IMPORTED_LOCATION ${JPEG_BUILD_DIR}/${ANDROID_ABI}/libjpeg-turbo.a)
 
-add_library(jpegkit SHARED ${CMAKE_SOURCE_DIR}/cpp/JniJpeg.cpp)
+add_library(jpegkit SHARED ${CMAKE_SOURCE_DIR}/src/main/cpp/JniJpeg.cpp)
 
 target_link_libraries(jpegkit libjpeg)

jpegkit/build.gradle

@@ -1,26 +1,35 @@
 plugins {
+    id 'com.android.library'
     id 'com.jfrog.bintray' version '1.7.3'
     id 'com.github.dcendents.android-maven' version '1.5'
 }
 
-apply plugin: 'com.android.library'
-
 android {
-    compileSdkVersion rootProject.ext.compileSdkVersion
-    buildToolsVersion rootProject.ext.buildToolsVersion
+    compileSdkVersion = 27
+    buildToolsVersion = '27.0.3'
     defaultConfig {
-        minSdkVersion rootProject.ext.minSdkVersion
-        targetSdkVersion rootProject.ext.targetSdkVersion
+        minSdkVersion 15
+        targetSdkVersion 27
+        externalNativeBuild {
+            cmake {
+                cppFlags ''
+            }
+        }
     }
     externalNativeBuild {
         cmake {
-            path 'src/main/CMakeLists.txt'
+            path 'CMakeLists.txt'
         }
     }
 }
 
+repositories {
+    jcenter()
+    google()
+}
+
 dependencies {
-    implementation 'com.android.support:exifinterface:27.1.0'
+    implementation 'com.android.support:exifinterface:27.1.1'
 }
 
 ext.getBintrayUser = { ->
@@ -30,7 +39,7 @@ ext.getBintrayUser = { ->
 
     Properties properties = new Properties()
     properties.load(rootProject.file('local.properties').newDataInputStream())
-    return properties.getProperty('bintray.user');
+    return properties.getProperty('bintray.user')
 }
 
 ext.getBintrayKey = { ->
@@ -100,7 +109,7 @@ task deployRelease {
 }
 
 group = 'com.camerakit'
-version = '0.1.0'
+version = '0.2.0'
 
 install {
     repositories.mavenInstaller {