diff --git a/app/build.gradle b/app/build.gradle index 3eafe73158..834a7b3171 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -4,22 +4,17 @@ plugins { } android { - compileSdkVersion = 28 buildToolsVersion = '28.0.0' + compileSdkVersion = versions.compileSdk defaultConfig { applicationId 'com.camerakit.app' - minSdkVersion 15 - targetSdkVersion 28 - versionName '1.0.0' + minSdkVersion versions.minSdk + targetSdkVersion versions.targetSdk + versionName version versionCode 1 } } -repositories { - google() - jcenter() -} - dependencies { implementation project(':camerakit') implementation 'org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.2.50' @@ -27,4 +22,4 @@ dependencies { implementation 'com.android.support:appcompat-v7:28.0.0-alpha3' implementation 'com.android.support:design:28.0.0-alpha3' implementation 'de.hdodenhof:circleimageview:2.2.0' -} \ No newline at end of file +} diff --git a/build.gradle b/build.gradle index 13e7a4dcb7..e3ae323d1c 100644 --- a/build.gradle +++ b/build.gradle @@ -7,5 +7,28 @@ buildscript { dependencies { classpath 'com.android.tools.build:gradle:3.1.3' classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin:1.2.50' + classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.1' } -} \ No newline at end of file +} + +subprojects { project -> + group = 'com.camerakit' + version = '1.0.0-beta2' + + repositories { + google() + jcenter() + } + + ext { + versions = [ + minSdk : 15, + targetSdk : 28, + compileSdk : 28, + ] + } +} + +task clean(type: Delete) { + delete rootProject.buildDir +} diff --git a/camerakit/build.gradle b/camerakit/build.gradle index c62e55b45d..9c3805852d 100644 --- a/camerakit/build.gradle +++ b/camerakit/build.gradle @@ -1,25 +1,19 @@ plugins { id 'com.android.library' id 'kotlin-android' - id 'com.jfrog.bintray' version '1.7.3' id 'com.github.dcendents.android-maven' version '1.5' } android { - compileSdkVersion 28 + compileSdkVersion versions.compileSdk defaultConfig { - minSdkVersion 15 + minSdkVersion versions.minSdk } testOptions { unitTests.returnDefaultValues = true } } -repositories { - google() - jcenter() -} - dependencies { implementation 'org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.2.50' implementation 'com.android.support:support-annotations:27.1.1' @@ -28,110 +22,14 @@ dependencies { testImplementation 'org.mockito:mockito-core:1.10.19' } -ext.getBintrayUser = { -> - if (System.getenv('BINTRAY_USER')) { - return System.getenv('BINTRAY_USER') - } - - if (rootProject.file('local.properties').exists()) { - Properties properties = new Properties() - properties.load(rootProject.file('local.properties').newDataInputStream()) - return properties.getProperty('bintray.user') - } -} - -ext.getBintrayKey = { -> - if (System.getenv('BINTRAY_KEY')) { - return System.getenv('BINTRAY_KEY') - } - - if (rootProject.file('local.properties').exists()) { - Properties properties = new Properties() - properties.load(rootProject.file('local.properties').newDataInputStream()) - return properties.getProperty('bintray.key') - } -} - -task cleanDeployment { - doLast { - logger.lifecycle('Deployment: Cleaning...') - logger.lifecycle('Deleting: ' + project.buildDir) - delete project.buildDir - } -} - -task buildDeployment { - shouldRunAfter(cleanDeployment) - finalizedBy assemble - - doFirst { - android.variantFilter { variant -> - if (variant.buildType.name == 'debug') { - variant.setIgnore(true) - } - } - } -} - -task deploySnapshot { - shouldRunAfter(buildDeployment) - - dependsOn cleanDeployment - dependsOn buildDeployment - finalizedBy bintrayUpload - - doLast { - version = version + '-Snapshot' - bintrayUpload.setVersionName(bintrayUpload.getVersionName() + '-Snapshot') - bintrayUpload.setUserOrg('camerakit') - bintrayUpload.setRepoName('camerakit-android-snapshots') - bintrayUpload.setOverride(true) - bintrayUpload.setPublish(true) - - logger.lifecycle('Deploying version ' + bintrayUpload.getVersionName() + ' in ' + bintrayUpload.getRepoName()) - } -} - -task deployRelease { - shouldRunAfter(buildDeployment) - - dependsOn cleanDeployment - dependsOn buildDeployment - finalizedBy bintrayUpload - - doLast { - bintrayUpload.setUserOrg('camerakit') - bintrayUpload.setRepoName('camerakit-android') - - logger.lifecycle('Deploying version ' + bintrayUpload.getVersionName() + ' in ' + bintrayUpload.getRepoName()) - } -} - -group = 'com.camerakit' -version = '1.0.0-beta2' - install { repositories.mavenInstaller { pom.project { - name 'camerakit-android' - groupId 'com.camerakit' + groupId project.group artifactId 'camerakit' packaging 'aar' } } } -bintray { - user = getBintrayUser() - key = getBintrayKey() - configurations = ['archives'] - pkg { - name = 'camerakit-android' - vcsUrl = 'https://github.com/CameraKit/camerakit-android.git' - licenses = ['MIT'] - version { - name = project.version - released = new Date() - } - } -} \ No newline at end of file +apply from : 'deploy.gradle' diff --git a/camerakit/deploy.gradle b/camerakit/deploy.gradle new file mode 100644 index 0000000000..e96b19efdc --- /dev/null +++ b/camerakit/deploy.gradle @@ -0,0 +1,98 @@ +def getBintrayUser() { + if (System.getenv('BINTRAY_USER')) { + return System.getenv('BINTRAY_USER') + } + + if (rootProject.file('local.properties').exists()) { + Properties properties = new Properties() + properties.load(rootProject.file('local.properties').newDataInputStream()) + return properties.getProperty('bintray.user') + } +} + +def getBintrayKey() { + if (System.getenv('BINTRAY_KEY')) { + return System.getenv('BINTRAY_KEY') + } + + if (rootProject.file('local.properties').exists()) { + Properties properties = new Properties() + properties.load(rootProject.file('local.properties').newDataInputStream()) + return properties.getProperty('bintray.key') + } +} + +apply plugin: 'com.jfrog.bintray' + +bintray { + user = getBintrayUser() + key = getBintrayKey() + configurations = ['archives'] + pkg { + repo = 'camerakit-android' + name = 'camerakit-android' + userOrg = 'camerakit' + vcsUrl = 'https://github.com/CameraKit/camerakit-android.git' + licenses = ['MIT'] + + version { + name = project.version + released = new Date() + } + } +} + +task cleanForDeployment { + doLast { + logger.lifecycle('Deployment: Cleaning...') + logger.lifecycle('Deleting: ' + project.buildDir) + delete project.buildDir + } +} + +task buildForDeployment { + shouldRunAfter(cleanForDeployment) + finalizedBy assemble + + doFirst { + android.variantFilter { variant -> + if (variant.buildType.name == 'debug') { + variant.setIgnore(true) + } + } + } +} + +task deploySnapshot { + shouldRunAfter(buildForDeployment) + + dependsOn cleanForDeployment + dependsOn buildForDeployment + finalizedBy bintrayUpload + + doLast { + version = version + '-Snapshot' + bintrayUpload.setVersionName(bintrayUpload.getVersionName() + '-Snapshot') + bintrayUpload.setUserOrg('camerakit') + bintrayUpload.setRepoName('camerakit-android-snapshots') + bintrayUpload.setOverride(true) + bintrayUpload.setPublish(true) + + logger.lifecycle('Deploying version ' + bintrayUpload.getVersionName() + ' in ' + bintrayUpload.getRepoName()) + } +} + +task deployRelease { + shouldRunAfter(buildForDeployment) + + dependsOn cleanForDeployment + dependsOn buildForDeployment + finalizedBy bintrayUpload + + doLast { + bintrayUpload.setUserOrg('camerakit') + bintrayUpload.setRepoName('camerakit-android') + + logger.lifecycle('Deploying version ' + bintrayUpload.getVersionName() + ' in ' + bintrayUpload.getRepoName()) + } +}