settings updated

pull/1208/head
ArsalImam 4 years ago
parent 399844321b
commit 569e57eac8
  1. 132
      cameraview/build.gradle.kts
  2. 8
      cameraview/src/main/java/com/otaliastudios/cameraview/filter/FilterParser.java
  3. 7
      settings.gradle
  4. 2
      settings.gradle.kts

@ -1,12 +1,12 @@
import io.deepmedia.tools.publisher.common.License //import io.deepmedia.tools.publisher.common.License
import io.deepmedia.tools.publisher.common.Release //import io.deepmedia.tools.publisher.common.Release
import io.deepmedia.tools.publisher.common.GithubScm //import io.deepmedia.tools.publisher.common.GithubScm
plugins { plugins {
id("com.android.library") id("com.android.library")
id("kotlin-android") id("kotlin-android")
id("io.deepmedia.tools.publisher") // id("io.deepmedia.tools.publisher")
id("jacoco") // id("jacoco")
} }
android { android {
@ -44,37 +44,37 @@ dependencies {
// Publishing // Publishing
publisher { //publisher {
project.description = "A well documented, high-level Android interface that makes capturing " + // project.description = "A well documented, high-level Android interface that makes capturing " +
"pictures and videos easy, addressing all of the common issues and needs. " + // "pictures and videos easy, addressing all of the common issues and needs. " +
"Real-time filters, gestures, watermarks, frame processing, RAW, output of any size." // "Real-time filters, gestures, watermarks, frame processing, RAW, output of any size."
project.artifact = "cameraview" // project.artifact = "cameraview"
project.group = "com.otaliastudios" // project.group = "com.otaliastudios"
project.url = "https://github.com/natario1/CameraView" // project.url = "https://github.com/natario1/CameraView"
project.scm = GithubScm("natario1", "CameraView") // project.scm = GithubScm("natario1", "CameraView")
project.addLicense(License.APACHE_2_0) // project.addLicense(License.APACHE_2_0)
project.addDeveloper("natario1", "mat.iavarone@gmail.com") // project.addDeveloper("natario1", "mat.iavarone@gmail.com")
release.sources = Release.SOURCES_AUTO // release.sources = Release.SOURCES_AUTO
release.docs = Release.DOCS_AUTO // release.docs = Release.DOCS_AUTO
//
directory() // directory()
//
sonatype { // sonatype {
auth.user = "SONATYPE_USER" // auth.user = "SONATYPE_USER"
auth.password = "SONATYPE_PASSWORD" // auth.password = "SONATYPE_PASSWORD"
signing.key = "SIGNING_KEY" // signing.key = "SIGNING_KEY"
signing.password = "SIGNING_PASSWORD" // signing.password = "SIGNING_PASSWORD"
} // }
//
sonatype("snapshot") { // sonatype("snapshot") {
repository = io.deepmedia.tools.publisher.sonatype.Sonatype.OSSRH_SNAPSHOT_1 // repository = io.deepmedia.tools.publisher.sonatype.Sonatype.OSSRH_SNAPSHOT_1
release.version = "latest-SNAPSHOT" // release.version = "latest-SNAPSHOT"
auth.user = "SONATYPE_USER" // auth.user = "SONATYPE_USER"
auth.password = "SONATYPE_PASSWORD" // auth.password = "SONATYPE_PASSWORD"
signing.key = "SIGNING_KEY" // signing.key = "SIGNING_KEY"
signing.password = "SIGNING_PASSWORD" // signing.password = "SIGNING_PASSWORD"
} // }
} //}
// Code Coverage // Code Coverage
val buildDir = project.buildDir.absolutePath val buildDir = project.buildDir.absolutePath
@ -106,33 +106,33 @@ tasks.register("runAndroidTests") { // changing name? change github workflow
} }
// Merge the two with a jacoco task. // Merge the two with a jacoco task.
jacoco { toolVersion = "0.8.5" } //jacoco { toolVersion = "0.8.5" }
tasks.register("computeCoverage", JacocoReport::class) { //tasks.register("computeCoverage", JacocoReport::class) {
dependsOn("compileDebugSources") // Compile sources, needed below // dependsOn("compileDebugSources") // Compile sources, needed below
executionData.from(fileTree(coverageInputDir)) // executionData.from(fileTree(coverageInputDir))
sourceDirectories.from(android.sourceSets["main"].java.srcDirs) // sourceDirectories.from(android.sourceSets["main"].java.srcDirs)
additionalSourceDirs.from("$buildDir/generated/source/buildConfig/debug") // additionalSourceDirs.from("$buildDir/generated/source/buildConfig/debug")
additionalSourceDirs.from("$buildDir/generated/source/r/debug") // additionalSourceDirs.from("$buildDir/generated/source/r/debug")
classDirectories.from(fileTree("$buildDir/intermediates/javac/debug") { // classDirectories.from(fileTree("$buildDir/intermediates/javac/debug") {
// Not everything here is relevant for CameraView, but let's keep it generic // // Not everything here is relevant for CameraView, but let's keep it generic
exclude( // exclude(
"**/R.class", // "**/R.class",
"**/R$*.class", // "**/R$*.class",
"**/BuildConfig.*", // "**/BuildConfig.*",
"**/Manifest*.*", // "**/Manifest*.*",
"android/**", // "android/**",
"androidx/**", // "androidx/**",
"com/google/**", // "com/google/**",
"**/*\$ViewInjector*.*", // "**/*\$ViewInjector*.*",
"**/Dagger*Component.class", // "**/Dagger*Component.class",
"**/Dagger*Component\$Builder.class", // "**/Dagger*Component\$Builder.class",
"**/*Module_*Factory.class", // "**/*Module_*Factory.class",
// We don"t test OpenGL filters. // // We don"t test OpenGL filters.
"**/com/otaliastudios/cameraview/filters/**.*" // "**/com/otaliastudios/cameraview/filters/**.*"
) // )
}) // })
reports.html.isEnabled = true // reports.html.isEnabled = true
reports.xml.isEnabled = true // reports.xml.isEnabled = true
reports.html.destination = file("$coverageOutputDir/html") // reports.html.destination = file("$coverageOutputDir/html")
reports.xml.destination = file("$coverageOutputDir/xml/report.xml") // reports.xml.destination = file("$coverageOutputDir/xml/report.xml")
} //}

@ -12,10 +12,9 @@ import com.otaliastudios.cameraview.R;
*/ */
public class FilterParser { public class FilterParser {
private Filter filter = null; private Filter filter;
public FilterParser(@NonNull TypedArray array) { public FilterParser(@NonNull String filterName) {
String filterName = array.getString(R.styleable.CameraView_cameraFilter);
try { try {
//noinspection ConstantConditions //noinspection ConstantConditions
Class<?> filterClass = Class.forName(filterName); Class<?> filterClass = Class.forName(filterName);
@ -24,6 +23,9 @@ public class FilterParser {
filter = new NoFilter(); filter = new NoFilter();
} }
} }
public FilterParser(@NonNull TypedArray array) {
this(array.getString(R.styleable.CameraView_cameraFilter));
}
@NonNull @NonNull
public Filter getFilter() { public Filter getFilter() {

@ -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')

@ -1,2 +0,0 @@
include(":cameraview")
include(":demo")
Loading…
Cancel
Save