From 660d4ef269f1482aa9a002d79b65bbfaec6ea866 Mon Sep 17 00:00:00 2001 From: Michal Hajek Date: Thu, 27 Feb 2020 23:55:20 +0100 Subject: [PATCH 1/3] Added dependency on maven local repository --- build.gradle | 1 + sample/build.gradle | 2 ++ 2 files changed, 3 insertions(+) diff --git a/build.gradle b/build.gradle index 228da65..fc88dea 100644 --- a/build.gradle +++ b/build.gradle @@ -1,6 +1,7 @@ allprojects { repositories { + mavenLocal() mavenCentral() maven { url 'https://repo.gradle.org/gradle/libs-releases' } } diff --git a/sample/build.gradle b/sample/build.gradle index 37e8034..1382f24 100644 --- a/sample/build.gradle +++ b/sample/build.gradle @@ -5,6 +5,7 @@ buildscript { google() maven { url "https://plugins.gradle.org/m2/" } maven { url 'https://repo.gradle.org/gradle/libs-releases' } + mavenLocal() } dependencies { //noinspection GradleDependency @@ -18,6 +19,7 @@ repositories { jcenter() google() mavenCentral() + mavenLocal() } apply plugin: 'com.android.application' From 1e19db9c8f332e85ea9155e9b78060636bcea97f Mon Sep 17 00:00:00 2001 From: Michal Hajek Date: Fri, 28 Feb 2020 00:01:36 +0100 Subject: [PATCH 2/3] Fixed constant of OpenCV version --- sample/src/main/java/com/ahasbini/sample/MainActivity.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sample/src/main/java/com/ahasbini/sample/MainActivity.java b/sample/src/main/java/com/ahasbini/sample/MainActivity.java index fa974d8..0ec4f46 100644 --- a/sample/src/main/java/com/ahasbini/sample/MainActivity.java +++ b/sample/src/main/java/com/ahasbini/sample/MainActivity.java @@ -58,7 +58,7 @@ protected void onResume() { super.onResume(); if (!OpenCVLoader.initDebug()) { Log.i(TAG, "Internal OpenCV library not found. Using OpenCV Manager for initiation"); - OpenCVLoader.initAsync(OpenCVLoader.OPENCV_VERSION_3_4_0, this, mLoaderCallback); + OpenCVLoader.initAsync(OpenCVLoader.OPENCV_VERSION, this, mLoaderCallback); } else { Log.i(TAG, "OpenCV library found inside package. Using it"); mLoaderCallback.onManagerConnected(LoaderCallbackInterface.SUCCESS); From e2edab5e90b136d343735b8d67b311c3a57de59d Mon Sep 17 00:00:00 2001 From: Michal Hajek Date: Fri, 28 Feb 2020 00:05:29 +0100 Subject: [PATCH 3/3] Plugin use the current version of gradle --- .../java/com/ahasbini/tools/androidopencv/Constants.java | 1 + .../androidopencv/task/BuildAndroidOpenCVAarsTask.java | 8 +++++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/plugin/src/main/java/com/ahasbini/tools/androidopencv/Constants.java b/plugin/src/main/java/com/ahasbini/tools/androidopencv/Constants.java index 271cb80..01859dd 100644 --- a/plugin/src/main/java/com/ahasbini/tools/androidopencv/Constants.java +++ b/plugin/src/main/java/com/ahasbini/tools/androidopencv/Constants.java @@ -9,5 +9,6 @@ public class Constants { public static final String OPENCV_VERSION_ANDROID_SDK_EXTRACTED_DIRECTORY_NAME = "opencv-%s-android-sdk"; public static final String OPENCV_AAR_NAME_PREFIX = "opencv"; public static final String EXTRACTED_OPENCV_ROOT_DIRECTORY_NAME = "OpenCV-android-sdk"; + public static final String GRADLE_VERSION = null; } diff --git a/plugin/src/main/java/com/ahasbini/tools/androidopencv/task/BuildAndroidOpenCVAarsTask.java b/plugin/src/main/java/com/ahasbini/tools/androidopencv/task/BuildAndroidOpenCVAarsTask.java index feffbea..9e2acf2 100644 --- a/plugin/src/main/java/com/ahasbini/tools/androidopencv/task/BuildAndroidOpenCVAarsTask.java +++ b/plugin/src/main/java/com/ahasbini/tools/androidopencv/task/BuildAndroidOpenCVAarsTask.java @@ -17,12 +17,14 @@ import org.gradle.tooling.BuildLauncher; import org.gradle.tooling.GradleConnector; import org.gradle.tooling.ProjectConnection; +import org.gradle.util.GradleVersion; import java.io.File; import java.io.IOException; import java.nio.file.Files; import java.nio.file.StandardOpenOption; import java.util.ArrayList; +import java.util.Optional; import java.util.ResourceBundle; /** @@ -182,10 +184,14 @@ private void performBuildAndroidOpenCVAars() { ExceptionUtils.getCauses(e, messages.getString("caused_by")), e); } + String gradleVersion = Optional.ofNullable(Constants.GRADLE_VERSION) + .orElse(GradleVersion.current().getVersion()); + logger.info("Use GradleVersion: " + gradleVersion); + // Build AAR binaries try (ProjectConnection buildCacheProjectConnection = GradleConnector.newConnector() .forProjectDirectory(androidOpenCVBuildCacheDir) - .useGradleVersion("4.1") + .useGradleVersion(gradleVersion) .connect()) { BuildLauncher launcher = buildCacheProjectConnection.newBuild()