From a7c29aa82b4b25fa1405e72d70918a45acf7992f Mon Sep 17 00:00:00 2001 From: irgaly Date: Wed, 1 Sep 2021 00:08:22 +0900 Subject: [PATCH 1/9] clean up bintray settings --- build.gradle | 8 -------- debot-no-op/build.gradle | 19 ------------------- debot/build.gradle | 21 --------------------- gradle/gradle-artifactory-upload.gradle | 21 --------------------- 4 files changed, 69 deletions(-) delete mode 100644 gradle/gradle-artifactory-upload.gradle diff --git a/build.gradle b/build.gradle index e4a543d..f3ac409 100644 --- a/build.gradle +++ b/build.gradle @@ -4,8 +4,6 @@ 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 : "" repositories { google() mavenCentral() @@ -13,12 +11,6 @@ buildscript { 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 } } diff --git a/debot-no-op/build.gradle b/debot-no-op/build.gradle index 769884c..d91361c 100644 --- a/debot-no-op/build.gradle +++ b/debot-no-op/build.gradle @@ -1,6 +1,5 @@ apply plugin: 'com.android.library' apply plugin: 'kotlin-android' -//apply plugin: 'com.github.panpf.bintray-publish' apply plugin: 'maven-publish' android { @@ -29,22 +28,6 @@ android { } } -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 } @@ -67,5 +50,3 @@ afterEvaluate { } } } - -//apply from: rootProject.file('gradle/gradle-artifactory-upload.gradle') diff --git a/debot/build.gradle b/debot/build.gradle index c87bfd2..411608c 100644 --- a/debot/build.gradle +++ b/debot/build.gradle @@ -1,6 +1,5 @@ apply plugin: 'com.android.library' apply plugin: 'kotlin-android' -//apply plugin: 'com.github.panpf.bintray-publish' apply plugin: 'maven-publish' android { @@ -46,23 +45,6 @@ dependencies { 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'] -} - */ - -// Avoid Kotlin docs error tasks.withType(Javadoc) { enabled = false } @@ -72,7 +54,6 @@ repositories { } -// For JFrog artifactory upload afterEvaluate { publishing { publications { @@ -85,5 +66,3 @@ afterEvaluate { } } } - -//apply from: rootProject.file('gradle/gradle-artifactory-upload.gradle') 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 From b2ec88eb37523dc42bd0da215bca67bfb950eeb2 Mon Sep 17 00:00:00 2001 From: irgaly Date: Wed, 1 Sep 2021 00:12:38 +0900 Subject: [PATCH 2/9] clean up build.gradle --- .circleci/config.yml | 3 --- debot-no-op/build.gradle | 5 ----- debot-sample/build.gradle | 1 - debot/build.gradle | 10 ---------- dependencies.gradle | 1 - 5 files changed, 20 deletions(-) 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/debot-no-op/build.gradle b/debot-no-op/build.gradle index d91361c..adee5b4 100644 --- a/debot-no-op/build.gradle +++ b/debot-no-op/build.gradle @@ -28,12 +28,7 @@ android { } } -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" } diff --git a/debot-sample/build.gradle b/debot-sample/build.gradle index 03c72f3..bfae6ef 100644 --- a/debot-sample/build.gradle +++ b/debot-sample/build.gradle @@ -19,7 +19,6 @@ android { } dependencies { - implementation fileTree(dir: 'libs', include: ['*.jar']) implementation 'androidx.appcompat:appcompat:1.1.0' // implementation "com.github.tomoima525.debot:debot:$library_version" implementation project(':debot') diff --git a/debot/build.gradle b/debot/build.gradle index 411608c..59a9a23 100644 --- a/debot/build.gradle +++ b/debot/build.gradle @@ -30,7 +30,6 @@ android { } dependencies { - implementation fileTree(dir: 'libs', include: ['*.jar']) implementation 'androidx.appcompat:appcompat:1.2.0' implementation "com.squareup:seismic:$versions.seismic" @@ -45,15 +44,6 @@ dependencies { implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" } -tasks.withType(Javadoc) { - enabled = false -} - -repositories { - mavenCentral() -} - - afterEvaluate { publishing { publications { diff --git a/dependencies.gradle b/dependencies.gradle index 8128703..0d05c9c 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -1,5 +1,4 @@ ext.versions = [ - supportLibrary : '27.1.0', androidKtx : '0.2', seismic : '1.0.2', From 578dc82bac0f5505da598d35e15a7eb3e0f0191d Mon Sep 17 00:00:00 2001 From: irgaly Date: Wed, 1 Sep 2021 00:33:26 +0900 Subject: [PATCH 3/9] remove versionCode/versionName from library --- debot-no-op/build.gradle | 2 -- debot/build.gradle | 2 -- 2 files changed, 4 deletions(-) diff --git a/debot-no-op/build.gradle b/debot-no-op/build.gradle index adee5b4..56326cd 100644 --- a/debot-no-op/build.gradle +++ b/debot-no-op/build.gradle @@ -8,8 +8,6 @@ android { defaultConfig { minSdkVersion 16 targetSdkVersion 29 - versionCode 1 - versionName "1.0" } buildTypes { release { diff --git a/debot/build.gradle b/debot/build.gradle index 59a9a23..1b7d5d9 100644 --- a/debot/build.gradle +++ b/debot/build.gradle @@ -8,8 +8,6 @@ android { defaultConfig { minSdkVersion 16 targetSdkVersion 29 - versionCode 1 - versionName "1.0" testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner' } buildTypes { From f2b1234d2a5c19b483c1577e7baa578202b719b0 Mon Sep 17 00:00:00 2001 From: irgaly Date: Wed, 1 Sep 2021 00:38:19 +0900 Subject: [PATCH 4/9] update kotlin 1.5.30 --- build.gradle | 2 +- debot-no-op/build.gradle | 8 -------- debot-sample/build.gradle | 1 - debot/build.gradle | 8 -------- 4 files changed, 1 insertion(+), 18 deletions(-) diff --git a/build.gradle b/build.gradle index f3ac409..d73e20b 100644 --- a/build.gradle +++ b/build.gradle @@ -2,7 +2,7 @@ apply from: 'dependencies.gradle' buildscript { - ext.kotlin_version = '1.4.31' + ext.kotlin_version = '1.5.30' ext.library_version = "2.0.7" repositories { google() diff --git a/debot-no-op/build.gradle b/debot-no-op/build.gradle index 56326cd..d7cbdcb 100644 --- a/debot-no-op/build.gradle +++ b/debot-no-op/build.gradle @@ -4,7 +4,6 @@ apply plugin: 'maven-publish' android { compileSdkVersion 30 - defaultConfig { minSdkVersion 16 targetSdkVersion 29 @@ -15,12 +14,6 @@ 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' } @@ -28,7 +21,6 @@ android { dependencies { implementation 'androidx.appcompat:appcompat:1.0.0' - implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" } afterEvaluate { diff --git a/debot-sample/build.gradle b/debot-sample/build.gradle index bfae6ef..5f45563 100644 --- a/debot-sample/build.gradle +++ b/debot-sample/build.gradle @@ -2,7 +2,6 @@ apply plugin: 'com.android.application' android { compileSdkVersion 30 - defaultConfig { applicationId "com.tomoima.debot.sample" minSdkVersion 16 diff --git a/debot/build.gradle b/debot/build.gradle index 1b7d5d9..88822c2 100644 --- a/debot/build.gradle +++ b/debot/build.gradle @@ -4,7 +4,6 @@ apply plugin: 'maven-publish' android { compileSdkVersion 30 - defaultConfig { minSdkVersion 16 targetSdkVersion 29 @@ -16,12 +15,6 @@ 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' } @@ -39,7 +32,6 @@ dependencies { } 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" } afterEvaluate { From 39bba074be6fad93b59e3a44e18990041ae0b28f Mon Sep 17 00:00:00 2001 From: irgaly Date: Wed, 1 Sep 2021 00:44:31 +0900 Subject: [PATCH 5/9] update AndroidX AppCompat 1.3.1 --- debot-no-op/build.gradle | 2 +- debot-sample/build.gradle | 4 ++-- debot/build.gradle | 2 +- dependencies.gradle | 15 +++++---------- 4 files changed, 9 insertions(+), 14 deletions(-) diff --git a/debot-no-op/build.gradle b/debot-no-op/build.gradle index d7cbdcb..2b3558f 100644 --- a/debot-no-op/build.gradle +++ b/debot-no-op/build.gradle @@ -20,7 +20,7 @@ android { } dependencies { - implementation 'androidx.appcompat:appcompat:1.0.0' + implementation 'androidx.appcompat:appcompat:1.3.1' } afterEvaluate { diff --git a/debot-sample/build.gradle b/debot-sample/build.gradle index 5f45563..6386097 100644 --- a/debot-sample/build.gradle +++ b/debot-sample/build.gradle @@ -18,8 +18,8 @@ android { } dependencies { - 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/build.gradle b/debot/build.gradle index 88822c2..202735c 100644 --- a/debot/build.gradle +++ b/debot/build.gradle @@ -21,7 +21,7 @@ android { } dependencies { - implementation 'androidx.appcompat:appcompat:1.2.0' + implementation 'androidx.appcompat:appcompat:1.3.1' implementation "com.squareup:seismic:$versions.seismic" androidTestImplementation 'androidx.test.ext:junit:1.1.1' diff --git a/dependencies.gradle b/dependencies.gradle index 0d05c9c..5fb61f5 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -1,12 +1,7 @@ ext.versions = [ - supportLibrary : '27.1.0', - androidKtx : '0.2', - seismic : '1.0.2', - 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' + seismic : '1.0.2', + hamcrest : '1.3', + mockitoCore : '2.7.21', + dexmakerMokito : '2.28.1', + mockitoKotlin : '3.2.0' ] From 6a0987d7947d5ebc80b823497deb41f8e87a1e1d Mon Sep 17 00:00:00 2001 From: irgaly Date: Wed, 1 Sep 2021 00:50:30 +0900 Subject: [PATCH 6/9] support Android 12 --- debot-no-op/build.gradle | 4 ++-- debot-sample/build.gradle | 4 ++-- debot-sample/src/main/AndroidManifest.xml | 3 ++- debot/build.gradle | 4 ++-- 4 files changed, 8 insertions(+), 7 deletions(-) diff --git a/debot-no-op/build.gradle b/debot-no-op/build.gradle index 2b3558f..e9d02a2 100644 --- a/debot-no-op/build.gradle +++ b/debot-no-op/build.gradle @@ -3,10 +3,10 @@ apply plugin: 'kotlin-android' apply plugin: 'maven-publish' android { - compileSdkVersion 30 + compileSdkVersion 31 defaultConfig { minSdkVersion 16 - targetSdkVersion 29 + targetSdkVersion 31 } buildTypes { release { diff --git a/debot-sample/build.gradle b/debot-sample/build.gradle index 6386097..a917c7e 100644 --- a/debot-sample/build.gradle +++ b/debot-sample/build.gradle @@ -1,11 +1,11 @@ apply plugin: 'com.android.application' android { - compileSdkVersion 30 + compileSdkVersion 31 defaultConfig { applicationId "com.tomoima.debot.sample" minSdkVersion 16 - targetSdkVersion 29 + targetSdkVersion 31 versionCode 1 versionName "1.0" } diff --git a/debot-sample/src/main/AndroidManifest.xml b/debot-sample/src/main/AndroidManifest.xml index d4366ba..3e1b974 100644 --- a/debot-sample/src/main/AndroidManifest.xml +++ b/debot-sample/src/main/AndroidManifest.xml @@ -14,7 +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 202735c..64af64d 100644 --- a/debot/build.gradle +++ b/debot/build.gradle @@ -3,10 +3,10 @@ apply plugin: 'kotlin-android' apply plugin: 'maven-publish' android { - compileSdkVersion 30 + compileSdkVersion 31 defaultConfig { minSdkVersion 16 - targetSdkVersion 29 + targetSdkVersion 31 testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner' } buildTypes { From 93eba0f9acb5aa8776914ee6ce37b6487b4d7dbd Mon Sep 17 00:00:00 2001 From: irgaly Date: Wed, 1 Sep 2021 00:57:45 +0900 Subject: [PATCH 7/9] update test dependencies --- build.gradle | 6 +----- debot/build.gradle | 14 +++++++------- dependencies.gradle | 7 ------- 3 files changed, 8 insertions(+), 19 deletions(-) delete mode 100644 dependencies.gradle diff --git a/build.gradle b/build.gradle index d73e20b..4d7224f 100644 --- a/build.gradle +++ b/build.gradle @@ -1,8 +1,4 @@ -// 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.5.30' ext.library_version = "2.0.7" repositories { google() @@ -10,7 +6,7 @@ buildscript { } dependencies { classpath 'com.android.tools.build:gradle:7.0.1' - classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" + classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.5.30" } } diff --git a/debot/build.gradle b/debot/build.gradle index 64af64d..a0c79b7 100644 --- a/debot/build.gradle +++ b/debot/build.gradle @@ -22,16 +22,16 @@ android { dependencies { implementation 'androidx.appcompat:appcompat:1.3.1' - implementation "com.squareup:seismic:$versions.seismic" + implementation "com.squareup:seismic:1.0.2" - 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" + androidTestImplementation "com.linkedin.dexmaker:dexmaker-mockito:2.28.1" + androidTestImplementation "org.mockito.kotlin:mockito-kotlin:3.2.0" } afterEvaluate { diff --git a/dependencies.gradle b/dependencies.gradle deleted file mode 100644 index 5fb61f5..0000000 --- a/dependencies.gradle +++ /dev/null @@ -1,7 +0,0 @@ -ext.versions = [ - seismic : '1.0.2', - hamcrest : '1.3', - mockitoCore : '2.7.21', - dexmakerMokito : '2.28.1', - mockitoKotlin : '3.2.0' -] From d2c566e315b6f7749833abf057c8b847cab8ee05 Mon Sep 17 00:00:00 2001 From: irgaly Date: Wed, 1 Sep 2021 00:58:38 +0900 Subject: [PATCH 8/9] bump up 2.1.0 --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 4d7224f..eefd978 100644 --- a/build.gradle +++ b/build.gradle @@ -1,5 +1,5 @@ buildscript { - ext.library_version = "2.0.7" + ext.library_version = "2.1.0" repositories { google() mavenCentral() From 5fdfb7da9d5ccbd42cb64e5285abb8eb240aeaad Mon Sep 17 00:00:00 2001 From: Tomoaki Imai Date: Wed, 29 Dec 2021 23:07:51 -0800 Subject: [PATCH 9/9] update android plugin --- build.gradle | 2 +- debot-no-op/build.gradle | 2 -- debot/build.gradle | 2 -- 3 files changed, 1 insertion(+), 5 deletions(-) diff --git a/build.gradle b/build.gradle index e4a543d..79d30f5 100644 --- a/build.gradle +++ b/build.gradle @@ -11,7 +11,7 @@ buildscript { mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:7.0.1' + classpath 'com.android.tools.build:gradle:7.0.3' 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" diff --git a/debot-no-op/build.gradle b/debot-no-op/build.gradle index 7cad1d3..c540702 100644 --- a/debot-no-op/build.gradle +++ b/debot-no-op/build.gradle @@ -9,8 +9,6 @@ android { defaultConfig { minSdkVersion 16 targetSdkVersion 31 - versionCode 1 - versionName "1.0" } buildTypes { release { diff --git a/debot/build.gradle b/debot/build.gradle index 02a155e..0cd39fe 100644 --- a/debot/build.gradle +++ b/debot/build.gradle @@ -9,8 +9,6 @@ android { defaultConfig { minSdkVersion 16 targetSdkVersion 31 - versionCode 1 - versionName "1.0" testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner' } buildTypes {