From 569e57eac835aef037b7e465c68a0697a458a4ba Mon Sep 17 00:00:00 2001 From: ArsalImam Date: Wed, 20 Oct 2021 04:18:41 +0500 Subject: [PATCH] settings updated --- cameraview/build.gradle.kts | 132 +++++++++--------- .../cameraview/filter/FilterParser.java | 8 +- settings.gradle | 7 + settings.gradle.kts | 2 - 4 files changed, 78 insertions(+), 71 deletions(-) create mode 100644 settings.gradle delete mode 100644 settings.gradle.kts diff --git a/cameraview/build.gradle.kts b/cameraview/build.gradle.kts index e75717f4..48db46be 100644 --- a/cameraview/build.gradle.kts +++ b/cameraview/build.gradle.kts @@ -1,12 +1,12 @@ -import io.deepmedia.tools.publisher.common.License -import io.deepmedia.tools.publisher.common.Release -import io.deepmedia.tools.publisher.common.GithubScm +//import io.deepmedia.tools.publisher.common.License +//import io.deepmedia.tools.publisher.common.Release +//import io.deepmedia.tools.publisher.common.GithubScm plugins { id("com.android.library") id("kotlin-android") - id("io.deepmedia.tools.publisher") - id("jacoco") +// id("io.deepmedia.tools.publisher") +// id("jacoco") } android { @@ -44,37 +44,37 @@ dependencies { // Publishing -publisher { - project.description = "A well documented, high-level Android interface that makes capturing " + - "pictures and videos easy, addressing all of the common issues and needs. " + - "Real-time filters, gestures, watermarks, frame processing, RAW, output of any size." - project.artifact = "cameraview" - project.group = "com.otaliastudios" - project.url = "https://github.com/natario1/CameraView" - project.scm = GithubScm("natario1", "CameraView") - project.addLicense(License.APACHE_2_0) - project.addDeveloper("natario1", "mat.iavarone@gmail.com") - release.sources = Release.SOURCES_AUTO - release.docs = Release.DOCS_AUTO - - directory() - - sonatype { - auth.user = "SONATYPE_USER" - auth.password = "SONATYPE_PASSWORD" - signing.key = "SIGNING_KEY" - signing.password = "SIGNING_PASSWORD" - } - - sonatype("snapshot") { - repository = io.deepmedia.tools.publisher.sonatype.Sonatype.OSSRH_SNAPSHOT_1 - release.version = "latest-SNAPSHOT" - auth.user = "SONATYPE_USER" - auth.password = "SONATYPE_PASSWORD" - signing.key = "SIGNING_KEY" - signing.password = "SIGNING_PASSWORD" - } -} +//publisher { +// project.description = "A well documented, high-level Android interface that makes capturing " + +// "pictures and videos easy, addressing all of the common issues and needs. " + +// "Real-time filters, gestures, watermarks, frame processing, RAW, output of any size." +// project.artifact = "cameraview" +// project.group = "com.otaliastudios" +// project.url = "https://github.com/natario1/CameraView" +// project.scm = GithubScm("natario1", "CameraView") +// project.addLicense(License.APACHE_2_0) +// project.addDeveloper("natario1", "mat.iavarone@gmail.com") +// release.sources = Release.SOURCES_AUTO +// release.docs = Release.DOCS_AUTO +// +// directory() +// +// sonatype { +// auth.user = "SONATYPE_USER" +// auth.password = "SONATYPE_PASSWORD" +// signing.key = "SIGNING_KEY" +// signing.password = "SIGNING_PASSWORD" +// } +// +// sonatype("snapshot") { +// repository = io.deepmedia.tools.publisher.sonatype.Sonatype.OSSRH_SNAPSHOT_1 +// release.version = "latest-SNAPSHOT" +// auth.user = "SONATYPE_USER" +// auth.password = "SONATYPE_PASSWORD" +// signing.key = "SIGNING_KEY" +// signing.password = "SIGNING_PASSWORD" +// } +//} // Code Coverage val buildDir = project.buildDir.absolutePath @@ -106,33 +106,33 @@ tasks.register("runAndroidTests") { // changing name? change github workflow } // Merge the two with a jacoco task. -jacoco { toolVersion = "0.8.5" } -tasks.register("computeCoverage", JacocoReport::class) { - dependsOn("compileDebugSources") // Compile sources, needed below - executionData.from(fileTree(coverageInputDir)) - sourceDirectories.from(android.sourceSets["main"].java.srcDirs) - additionalSourceDirs.from("$buildDir/generated/source/buildConfig/debug") - additionalSourceDirs.from("$buildDir/generated/source/r/debug") - classDirectories.from(fileTree("$buildDir/intermediates/javac/debug") { - // Not everything here is relevant for CameraView, but let's keep it generic - exclude( - "**/R.class", - "**/R$*.class", - "**/BuildConfig.*", - "**/Manifest*.*", - "android/**", - "androidx/**", - "com/google/**", - "**/*\$ViewInjector*.*", - "**/Dagger*Component.class", - "**/Dagger*Component\$Builder.class", - "**/*Module_*Factory.class", - // We don"t test OpenGL filters. - "**/com/otaliastudios/cameraview/filters/**.*" - ) - }) - reports.html.isEnabled = true - reports.xml.isEnabled = true - reports.html.destination = file("$coverageOutputDir/html") - reports.xml.destination = file("$coverageOutputDir/xml/report.xml") -} \ No newline at end of file +//jacoco { toolVersion = "0.8.5" } +//tasks.register("computeCoverage", JacocoReport::class) { +// dependsOn("compileDebugSources") // Compile sources, needed below +// executionData.from(fileTree(coverageInputDir)) +// sourceDirectories.from(android.sourceSets["main"].java.srcDirs) +// additionalSourceDirs.from("$buildDir/generated/source/buildConfig/debug") +// additionalSourceDirs.from("$buildDir/generated/source/r/debug") +// classDirectories.from(fileTree("$buildDir/intermediates/javac/debug") { +// // Not everything here is relevant for CameraView, but let's keep it generic +// exclude( +// "**/R.class", +// "**/R$*.class", +// "**/BuildConfig.*", +// "**/Manifest*.*", +// "android/**", +// "androidx/**", +// "com/google/**", +// "**/*\$ViewInjector*.*", +// "**/Dagger*Component.class", +// "**/Dagger*Component\$Builder.class", +// "**/*Module_*Factory.class", +// // We don"t test OpenGL filters. +// "**/com/otaliastudios/cameraview/filters/**.*" +// ) +// }) +// reports.html.isEnabled = true +// reports.xml.isEnabled = true +// reports.html.destination = file("$coverageOutputDir/html") +// reports.xml.destination = file("$coverageOutputDir/xml/report.xml") +//} \ No newline at end of file diff --git a/cameraview/src/main/java/com/otaliastudios/cameraview/filter/FilterParser.java b/cameraview/src/main/java/com/otaliastudios/cameraview/filter/FilterParser.java index 1f407acd..08f9351e 100644 --- a/cameraview/src/main/java/com/otaliastudios/cameraview/filter/FilterParser.java +++ b/cameraview/src/main/java/com/otaliastudios/cameraview/filter/FilterParser.java @@ -12,10 +12,9 @@ import com.otaliastudios.cameraview.R; */ public class FilterParser { - private Filter filter = null; + private Filter filter; - public FilterParser(@NonNull TypedArray array) { - String filterName = array.getString(R.styleable.CameraView_cameraFilter); + public FilterParser(@NonNull String filterName) { try { //noinspection ConstantConditions Class filterClass = Class.forName(filterName); @@ -24,6 +23,9 @@ public class FilterParser { filter = new NoFilter(); } } + public FilterParser(@NonNull TypedArray array) { + this(array.getString(R.styleable.CameraView_cameraFilter)); + } @NonNull public Filter getFilter() { diff --git a/settings.gradle b/settings.gradle new file mode 100644 index 00000000..2b9a856d --- /dev/null +++ b/settings.gradle @@ -0,0 +1,7 @@ +def rootDir = gradle.ext.cameraRoot +def modulePrefix = ':' +if (gradle.ext.has('cameraModulePrefix')) { + modulePrefix += gradle.ext.cameraModulePrefix +} +include modulePrefix +'lib' +project(modulePrefix + 'lib').projectDir = new File (rootDir, 'cameraview') \ No newline at end of file diff --git a/settings.gradle.kts b/settings.gradle.kts deleted file mode 100644 index 4100d446..00000000 --- a/settings.gradle.kts +++ /dev/null @@ -1,2 +0,0 @@ -include(":cameraview") -include(":demo")