Merge pull request #52 from irgaly/2.1.0

version 2.1.0: Android12 対応、Kotlin 1.5.30 対応、AGP 7.0.3 更新

Author: tomoima525

.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

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"
     }
 }
 

debot-no-op/build.gradle

@@ -1,58 +1,26 @@
 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 {
             minifyEnabled false
             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')

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

debot-sample/src/main/AndroidManifest.xml

@@ -14,8 +14,8 @@
         android:theme="@style/AppTheme" >
         <activity
             android:name="com.tomoima.debot.sample.activity.MainActivity"
-            android:exported="true"
-            android:label="@string/app_name" >
+            android:label="@string/app_name"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 

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