diff --git a/.circleci/config.yml b/.circleci/config.yml index 1684a7f..1bac0f2 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -10,9 +10,6 @@ jobs: - checkout - restore_cache: key: jars-{{ checksum "build.gradle" }}-{{ checksum "debot/build.gradle" }} -# - run: -# name: Chmod permissions #if permission for Gradlew Dependencies fail, use this. -# command: sudo chmod +x ./gradlew - run: name: Download Dependencies command: ./gradlew androidDependencies diff --git a/build.gradle b/build.gradle index e4a543d..19eec0d 100644 --- a/build.gradle +++ b/build.gradle @@ -1,24 +1,12 @@ -// Top-level build file where you can add configuration options common to all sub-projects/modules. -apply from: 'dependencies.gradle' - buildscript { - ext.kotlin_version = '1.4.31' - ext.library_version = "2.0.7" - ext.bintray_user = project.hasProperty("BINTRAY_USER") ? BINTRAY_USER : "" - ext.bintray_key = project.hasProperty('BINTRAY_KEY') ? BINTRAY_KEY : "" + ext.library_version = "2.1.0" repositories { google() mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:7.0.1' - classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" - // novoda bintray release do not support gradle 6.5 - //classpath "com.novoda:bintray-release:0.9.2" - //classpath "com.github.panpf.bintray-publish:bintray-publish:1.0.0" - //classpath "org.jfrog.buildinfo:build-info-extractor-gradle:4.18.3" - // NOTE: Do not place your application dependencies here; they belong - // in the individual module build.gradle files + classpath 'com.android.tools.build:gradle:7.0.3' + classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.5.30" } } diff --git a/debot-no-op/build.gradle b/debot-no-op/build.gradle index 7cad1d3..e9d02a2 100644 --- a/debot-no-op/build.gradle +++ b/debot-no-op/build.gradle @@ -1,16 +1,12 @@ apply plugin: 'com.android.library' apply plugin: 'kotlin-android' -//apply plugin: 'com.github.panpf.bintray-publish' apply plugin: 'maven-publish' android { compileSdkVersion 31 - defaultConfig { minSdkVersion 16 targetSdkVersion 31 - versionCode 1 - versionName "1.0" } buildTypes { release { @@ -18,41 +14,13 @@ android { proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' } } - - compileOptions { - encoding = 'UTF-8' - sourceCompatibility JavaVersion.VERSION_1_7 - targetCompatibility JavaVersion.VERSION_1_7 - } packagingOptions { exclude 'LICENSE.txt' } } -def siteUrl = 'https://github.com/tomoima525/debot' - -/* -publish { - userOrg = 'tomoima525' - groupId = 'com.tomoima.debot' - artifactId = 'debot-no-op' - bintrayUser = bintray_user - bintrayKey = bintray_key - publishVersion = library_version - desc = 'A simple Android library to create Debugging menu.' - website = siteUrl - licences = ['Apache-2.0'] -} - */ - -tasks.withType(Javadoc) { - enabled = false -} - dependencies { - implementation fileTree(dir: 'libs', include: ['*.jar']) - implementation 'androidx.appcompat:appcompat:1.0.0' - implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" + implementation 'androidx.appcompat:appcompat:1.3.1' } afterEvaluate { @@ -67,5 +35,3 @@ afterEvaluate { } } } - -//apply from: rootProject.file('gradle/gradle-artifactory-upload.gradle') diff --git a/debot-sample/build.gradle b/debot-sample/build.gradle index ba8b93c..a917c7e 100644 --- a/debot-sample/build.gradle +++ b/debot-sample/build.gradle @@ -2,7 +2,6 @@ apply plugin: 'com.android.application' android { compileSdkVersion 31 - defaultConfig { applicationId "com.tomoima.debot.sample" minSdkVersion 16 @@ -19,9 +18,8 @@ android { } dependencies { - implementation fileTree(dir: 'libs', include: ['*.jar']) - implementation 'androidx.appcompat:appcompat:1.1.0' - // implementation "com.github.tomoima525.debot:debot:$library_version" + implementation 'androidx.appcompat:appcompat:1.3.1' + //implementation "com.github.tomoima525.debot:debot:$library_version" implementation project(':debot') // Replace with debot-no-op for looking no-op sample //compile project(':debot-no-op') diff --git a/debot-sample/src/main/AndroidManifest.xml b/debot-sample/src/main/AndroidManifest.xml index 4774cd5..3e1b974 100644 --- a/debot-sample/src/main/AndroidManifest.xml +++ b/debot-sample/src/main/AndroidManifest.xml @@ -14,8 +14,8 @@ android:theme="@style/AppTheme" > + android:label="@string/app_name" + android:exported="true"> diff --git a/debot/build.gradle b/debot/build.gradle index 02a155e..fd216d6 100644 --- a/debot/build.gradle +++ b/debot/build.gradle @@ -1,16 +1,12 @@ apply plugin: 'com.android.library' apply plugin: 'kotlin-android' -//apply plugin: 'com.github.panpf.bintray-publish' apply plugin: 'maven-publish' android { compileSdkVersion 31 - defaultConfig { minSdkVersion 16 targetSdkVersion 31 - versionCode 1 - versionName "1.0" testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner' } buildTypes { @@ -19,60 +15,25 @@ android { proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' } } - - compileOptions { - encoding = 'UTF-8' - sourceCompatibility JavaVersion.VERSION_1_7 - targetCompatibility JavaVersion.VERSION_1_7 - } packagingOptions { exclude 'LICENSE.txt' } } dependencies { - implementation fileTree(dir: 'libs', include: ['*.jar']) - implementation 'androidx.appcompat:appcompat:1.2.0' - implementation "com.squareup:seismic:$versions.seismic" + implementation 'androidx.appcompat:appcompat:1.3.1' + implementation "com.squareup:seismic:1.0.3" - androidTestImplementation 'androidx.test.ext:junit:1.1.1' - androidTestImplementation 'androidx.test:rules:1.1.1' - androidTestImplementation "org.hamcrest:hamcrest-library:$versions.hamcrest" - androidTestImplementation("org.mockito:mockito-core:$versions.mockitoCore") { + androidTestImplementation 'androidx.test.ext:junit:1.1.3' + androidTestImplementation 'androidx.test:rules:1.4.0' + androidTestImplementation "org.hamcrest:hamcrest-library:1.3" + androidTestImplementation("org.mockito:mockito-core:3.9.0") { exclude group: 'org.hamcrest', module: 'hamcrest-core' } - androidTestImplementation "com.linkedin.dexmaker:dexmaker-mockito:$versions.dexmakerMokito" - androidTestImplementation "org.mockito.kotlin:mockito-kotlin:$versions.mockitoKotlin" - implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" -} - -def siteUrl = 'https://github.com/tomoima525/debot' - -/* -publish { - userOrg = 'tomoima525' - groupId = 'com.tomoima.debot' - artifactId = 'debot' - bintrayUser = bintray_user - bintrayKey = bintray_key - publishVersion = library_version - desc = 'A simple Android library to create Debugging menu.' - website = siteUrl - licences = ['Apache-2.0'] + androidTestImplementation "com.linkedin.dexmaker:dexmaker-mockito:2.28.1" + androidTestImplementation "org.mockito.kotlin:mockito-kotlin:3.2.0" } - */ -// Avoid Kotlin docs error -tasks.withType(Javadoc) { - enabled = false -} - -repositories { - mavenCentral() -} - - -// For JFrog artifactory upload afterEvaluate { publishing { publications { @@ -85,5 +46,3 @@ afterEvaluate { } } } - -//apply from: rootProject.file('gradle/gradle-artifactory-upload.gradle') diff --git a/dependencies.gradle b/dependencies.gradle deleted file mode 100644 index a45096f..0000000 --- a/dependencies.gradle +++ /dev/null @@ -1,13 +0,0 @@ -ext.versions = [ - - supportLibrary : '27.1.0', - androidKtx : '0.2', - seismic : '1.0.3', - junit : '4.12', - testRunner: '1.0.1', - espressoCore : '3.0.1', - hamcrest : '1.3', - mockitoCore : '2.7.21', - dexmakerMokito : '2.28.1', - mockitoKotlin : '3.2.0' -] diff --git a/gradle/gradle-artifactory-upload.gradle b/gradle/gradle-artifactory-upload.gradle deleted file mode 100644 index e6b31e2..0000000 --- a/gradle/gradle-artifactory-upload.gradle +++ /dev/null @@ -1,21 +0,0 @@ -apply plugin: 'com.jfrog.artifactory' - -artifactory { - contextUrl = 'https://oss.jfrog.org/artifactory' - publish { - repository { - // The Artifactory repository key to publish to - repoKey = library_version.endsWith('SNAPSHOT') ? 'oss-snapshot-local' : - 'oss-release-local' - //username = System.getenv('bintrayUser') // The publisher user name - //password = System.getenv('bintrayKey') // The publisher password - username = System.getenv('CI') ? System.getenv('BINTRAY_USER') : bintray_user - password = System.getenv('CI') ? System.getenv('BINTRAY_KEY') : bintray_key - maven = true - } - defaults { - publishArtifacts = true - publications('maven') - } - } -} \ No newline at end of file