You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by er...@apache.org on 2021/07/06 06:57:48 UTC
[cordova-android] branch master updated: feat!: drop abandoned
com.github.dcendents:android-maven-gradle-plugin (#1252)
This is an automated email from the ASF dual-hosted git repository.
erisu pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cordova-android.git
The following commit(s) were added to refs/heads/master by this push:
new 69b24db feat!: drop abandoned com.github.dcendents:android-maven-gradle-plugin (#1252)
69b24db is described below
commit 69b24dbf6a0e33d2a9ee360a464c2abf2568d661
Author: エリス <er...@users.noreply.github.com>
AuthorDate: Tue Jul 6 15:57:40 2021 +0900
feat!: drop abandoned com.github.dcendents:android-maven-gradle-plugin (#1252)
* feat: use maven-publish plugin (mavenCentral)
* fix: Apache License url
* fix: framework build failure without useAndroidX
* fix: add aar build artifact
---
framework/build.gradle | 69 +++++++++++++++++++++++----------------------
framework/gradle.properties | 19 +++++++++++++
2 files changed, 54 insertions(+), 34 deletions(-)
diff --git a/framework/build.gradle b/framework/build.gradle
index 55dd4e0..3fa224a 100644
--- a/framework/build.gradle
+++ b/framework/build.gradle
@@ -29,9 +29,6 @@ buildscript {
dependencies {
// Android Gradle Plugin (AGP) Build Tools
classpath "com.android.tools.build:gradle:${cordovaConfig.AGP_VERSION}"
-
- // @todo remove this abandoned plugin. maven-publish-plugin is now supported by Android Gradle plugin 3.6.0 and higher
- classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1'
}
}
@@ -41,12 +38,7 @@ allprojects {
}
apply plugin: 'com.android.library'
-
-// @todo remove this abandoned plugin. maven-publish-plugin is now supported by Android Gradle plugin 3.6.0 and higher
-apply plugin: 'com.github.dcendents.android-maven'
-
-group = 'org.apache.cordova'
-version = '10.0.0-dev'
+apply plugin: 'maven-publish'
android {
compileSdkVersion cordovaConfig.SDK_VERSION
@@ -82,50 +74,59 @@ android {
}
}
-// @todo after removing abandoned plugin "com.github.dcendents.android-maven". figure out what to do with this.
-install {
- repositories.mavenInstaller {
- pom {
- project {
- packaging 'aar'
- name 'Cordova'
- url 'https://cordova.apache.org'
+task sourcesJar(type: Jar) {
+ from android.sourceSets.main.java.srcDirs
+ classifier = 'sources'
+}
+
+publishing {
+ publications {
+ Cordova(MavenPublication) {
+ groupId = 'org.apache.cordova'
+ artifactId = 'framework'
+ version = '10.0.0-dev'
+
+ artifact(sourcesJar)
+ artifact("$buildDir/outputs/aar/framework-release.aar")
+
+ pom {
+ name = 'Cordova'
+ description = 'A library to build Cordova-based projects for the Android platform.'
+ url = 'https://cordova.apache.org'
+
licenses {
license {
- name 'The Apache Software License, Version 2.0'
- url 'http://www.apache.org/licenses/LICENSE-2.0.txt'
+ name = 'Apache License, Version 2.0'
+ url = 'https://www.apache.org/licenses/LICENSE-2.0.txt'
}
}
+
developers {
developer {
- id 'stevengill'
- name 'Steve Gill'
+ id = 'stevengill'
+ name = 'Steve Gill'
+ }
+ developer {
+ id = 'erisu'
+ name = 'Bryan Ellis'
+ email = 'erisu@apache.org'
}
}
- scm {
- connection 'scm:git:https://github.com/apache/cordova-android.git'
- developerConnection 'scm:git:git@github.com:apache/cordova-android.git'
- url 'https://github.com/apache/cordova-android'
+ scm {
+ connection = 'scm:git:https://github.com/apache/cordova-android.git'
+ developerConnection = 'scm:git:git@github.com:apache/cordova-android.git'
+ url = 'https://github.com/apache/cordova-android'
}
}
}
}
}
-task sourcesJar(type: Jar) {
- from android.sourceSets.main.java.srcDirs
- classifier = 'sources'
-}
-
dependencies {
implementation "androidx.appcompat:appcompat:${cordovaConfig.ANDROIDX_APP_COMPAT_VERSION}"
}
-artifacts {
- archives sourcesJar
-}
-
dependencies {
implementation 'androidx.webkit:webkit:1.3.0'
}
diff --git a/framework/gradle.properties b/framework/gradle.properties
new file mode 100644
index 0000000..30d2ba9
--- /dev/null
+++ b/framework/gradle.properties
@@ -0,0 +1,19 @@
+# Project-wide Gradle settings.
+
+# IDE (e.g. Android Studio) users:
+# Gradle settings configured through the IDE *will override*
+# any settings specified in this file.
+
+# For more details on how to configure your build environment visit
+# http://www.gradle.org/docs/current/userguide/build_environment.html
+
+# Specifies the JVM arguments used for the daemon process.
+# The setting is particularly useful for tweaking memory settings.
+org.gradle.jvmargs=-Xmx1536m
+android.useAndroidX=true
+android.enableJetifier=true
+
+# When configured, Gradle will run in incubating parallel mode.
+# This option should only be used with decoupled projects. More details, visit
+# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
+# org.gradle.parallel=true
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org