diff options
author | Victor Häggqvist <[email protected]> | 2018-07-26 21:30:57 +0200 |
---|---|---|
committer | Victor Häggqvist <[email protected]> | 2018-07-26 21:30:57 +0200 |
commit | b3cccb7a85211d6c0c3664afb5457d704e5708a8 (patch) | |
tree | f5a8637b61bdfa4335e1bf276fbad040ddcca353 /aboutit | |
parent | 2cc8561e3556892a7b13c6960acbe2a55f1f82ac (diff) |
update gradle and android plugin
Diffstat (limited to '')
-rw-r--r-- | aboutit-meta/build.gradle | 70 | ||||
-rw-r--r-- | aboutit-meta/gradle.properties | 4 | ||||
-rw-r--r-- | aboutit-sample/build.gradle | 14 | ||||
-rw-r--r-- | aboutit-sample/src/main/java/com/snilius/aboutit/sample/AboutActivity.java | 5 | ||||
-rw-r--r-- | aboutit-sample/src/main/java/com/snilius/aboutit/sample/MainActivity.java | 6 | ||||
-rw-r--r-- | aboutit/build.gradle | 94 | ||||
-rw-r--r-- | aboutit/gradle.properties | 4 |
7 files changed, 30 insertions, 167 deletions
diff --git a/aboutit-meta/build.gradle b/aboutit-meta/build.gradle index bb5b23c..a8aab23 100644 --- a/aboutit-meta/build.gradle +++ b/aboutit-meta/build.gradle @@ -1,21 +1,13 @@ apply plugin: 'com.android.library' -apply plugin: 'maven' -apply plugin: 'signing' -apply plugin: 'nexus-workflow' - -group = "com.snilius.aboutit" -archivesBaseName = "aboutit-meta" -version = "1.0.0" android { - compileSdkVersion 23 - buildToolsVersion "23.0.1" + compileSdkVersion 27 + buildToolsVersion "27.0.03" defaultConfig { minSdkVersion 14 - targetSdkVersion 23 + targetSdkVersion 27 versionCode 1 - versionName version } buildTypes { release { @@ -26,57 +18,7 @@ android { } dependencies { - compile fileTree(dir: 'libs', include: ['*.jar']) - compile 'com.android.support:appcompat-v7:23.0.1' - compile project(':aboutit') -} - - -signing { - sign configurations.archives + implementation fileTree(dir: 'libs', include: ['*.jar']) + implementation 'com.android.support:appcompat-v7:27.1.1' + implementation project(':aboutit') } - -uploadArchives { - repositories { - mavenDeployer { - beforeDeployment { MavenDeployment deployment -> signing.signPom(deployment) } - - repository(url: "https://oss.sonatype.org/service/local/staging/deploy/maven2/") { - authentication(userName: ossrhUsername, password: ossrhPassword) - } - - snapshotRepository(url: "https://oss.sonatype.org/content/repositories/snapshots/") { - authentication(userName: ossrhUsername, password: ossrhPassword) - } - - pom.project { - name 'AboutIt Meta' - packaging 'jar' - // optionally artifactId can be defined here - description 'Library presets for AboutIt' - url 'https://github.com/victorhaggqvist/AboutIt' - - scm { - connection 'scm:git:https://github.com/victorhaggqvist/AboutIt.git' - developerConnection 'scm:git:https://github.com/victorhaggqvist/AboutIt.git' - url 'https://github.com/victorhaggqvist/AboutIt' - } - - licenses { - license { - name 'The Apache License, Version 2.0' - url 'http://www.apache.org/licenses/LICENSE-2.0.txt' - } - } - - developers { - developer { - id 'atriix' - name 'Victor Häggqvist' - email '[email protected]' - } - } - } - } - } -}
\ No newline at end of file diff --git a/aboutit-meta/gradle.properties b/aboutit-meta/gradle.properties new file mode 100644 index 0000000..8bba6d2 --- /dev/null +++ b/aboutit-meta/gradle.properties @@ -0,0 +1,4 @@ +POM_ARTIFACT_ID=aboutit-meta +POM_NAME=AboutIt Meta +POM_PACKAGING=aar +VERSION_NAME=1.0.0-SNAPSHOT
\ No newline at end of file diff --git a/aboutit-sample/build.gradle b/aboutit-sample/build.gradle index d5ab9e5..6980597 100644 --- a/aboutit-sample/build.gradle +++ b/aboutit-sample/build.gradle @@ -1,13 +1,13 @@ apply plugin: 'com.android.application' android { - compileSdkVersion 23 - buildToolsVersion "23.0.1" + compileSdkVersion 27 + buildToolsVersion "27.0.03" defaultConfig { applicationId "com.snilius.aboutit.sample" minSdkVersion 14 - targetSdkVersion 23 + targetSdkVersion 27 versionCode 3 versionName "1.0.2" } @@ -20,8 +20,8 @@ android { } dependencies { - compile fileTree(include: ['*.jar'], dir: 'libs') - compile 'com.android.support:appcompat-v7:23.0.1' - compile project(':aboutit') - compile project(':aboutit-meta') + implementation fileTree(include: ['*.jar'], dir: 'libs') + implementation 'com.android.support:appcompat-v7:27.1.1' + implementation project(':aboutit') + implementation project(':aboutit-meta') } diff --git a/aboutit-sample/src/main/java/com/snilius/aboutit/sample/AboutActivity.java b/aboutit-sample/src/main/java/com/snilius/aboutit/sample/AboutActivity.java index 94b7c66..0520b50 100644 --- a/aboutit-sample/src/main/java/com/snilius/aboutit/sample/AboutActivity.java +++ b/aboutit-sample/src/main/java/com/snilius/aboutit/sample/AboutActivity.java @@ -1,11 +1,8 @@ package com.snilius.aboutit.sample; -import android.support.v7.app.ActionBarActivity; import android.os.Bundle; import android.support.v7.app.AppCompatActivity; import android.support.v7.widget.Toolbar; -import android.view.Menu; -import android.view.MenuItem; import com.snilius.aboutit.AboutIt; import com.snilius.aboutit.L; @@ -18,7 +15,7 @@ public class AboutActivity extends AppCompatActivity { super.onCreate(savedInstanceState); setContentView(R.layout.activity_about); - Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar); + Toolbar toolbar = findViewById(R.id.toolbar); setSupportActionBar(toolbar); getSupportActionBar().setTitle(R.string.about); diff --git a/aboutit-sample/src/main/java/com/snilius/aboutit/sample/MainActivity.java b/aboutit-sample/src/main/java/com/snilius/aboutit/sample/MainActivity.java index 1974129..f3ec338 100644 --- a/aboutit-sample/src/main/java/com/snilius/aboutit/sample/MainActivity.java +++ b/aboutit-sample/src/main/java/com/snilius/aboutit/sample/MainActivity.java @@ -25,14 +25,14 @@ public class MainActivity extends AppCompatActivity implements AdapterView.OnIte super.onCreate(savedInstanceState); setContentView(R.layout.activity_main); - Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar); + Toolbar toolbar = findViewById(R.id.toolbar); setSupportActionBar(toolbar); getSupportActionBar().setTitle(R.string.app_name); - Spinner spinner = (Spinner) findViewById(R.id.spinner); + Spinner spinner = findViewById(R.id.spinner); spinner.setOnItemSelectedListener(this); - mSampleText = (TextView) findViewById(R.id.sample_text); + mSampleText = findViewById(R.id.sample_text); } diff --git a/aboutit/build.gradle b/aboutit/build.gradle index bb3b89e..45d55d0 100644 --- a/aboutit/build.gradle +++ b/aboutit/build.gradle @@ -1,21 +1,13 @@ apply plugin: 'com.android.library' -apply plugin: 'maven' -apply plugin: 'signing' -apply plugin: 'nexus-workflow' - -group = "com.snilius.aboutit" -archivesBaseName = "aboutit" -version = "1.2.1" android { - compileSdkVersion 23 - buildToolsVersion '23.0.1' + compileSdkVersion 27 + buildToolsVersion '27.0.03' defaultConfig { minSdkVersion 14 - targetSdkVersion 23 + targetSdkVersion 27 versionCode 7 - versionName version } buildTypes { @@ -26,7 +18,7 @@ android { } dependencies { - compile 'com.android.support:appcompat-v7:23.0.1' + implementation 'com.android.support:appcompat-v7:27.1.1' } configurations { @@ -35,80 +27,4 @@ configurations { } } -signing { - sign configurations.archives -} - -uploadArchives { - repositories { - mavenDeployer { - beforeDeployment { MavenDeployment deployment -> signing.signPom(deployment) } - - repository(url: "https://oss.sonatype.org/service/local/staging/deploy/maven2/") { - authentication(userName: ossrhUsername, password: ossrhPassword) - } - - snapshotRepository(url: "https://oss.sonatype.org/content/repositories/snapshots/") { - authentication(userName: ossrhUsername, password: ossrhPassword) - } - - pom.project { - name 'AboutIt' - packaging 'jar' - // optionally artifactId can be defined here - description 'A About-page creator' - url 'https://github.com/victorhaggqvist/AboutIt' - - scm { - connection 'scm:git:https://github.com/victorhaggqvist/AboutIt.git' - developerConnection 'scm:git:https://github.com/victorhaggqvist/AboutIt.git' - url 'https://github.com/victorhaggqvist/AboutIt' - } - - licenses { - license { - name 'The Apache License, Version 2.0' - url 'http://www.apache.org/licenses/LICENSE-2.0.txt' - } - } - - developers { - developer { - id 'atriix' - name 'Victor Häggqvist' - email '[email protected]' - } - } - } - } - } -} - -android.libraryVariants.all { variant -> - task("${variant.name}Javadoc", type: Javadoc, dependsOn: "assemble${variant.name.capitalize()}") { - source = variant.javaCompile.source - - title = "AboutIt" - - options.links("http://docs.oracle.com/javase/7/docs/api/"); - options.linksOffline("http://d.android.com/reference","${android.sdkDirectory}/docs/reference"); - - // First add all of your dependencies to the classpath, then add the android jars - classpath += files(variant.javaCompile.classpath.files) - classpath += files(android.getBootClasspath()) - - // We're excluding these generated files - exclude '**/BuildConfig.java' - exclude '**/R.java' - } -} - -android.libraryVariants.all { variant -> - task("${variant.name}JavadocJar", type: Jar, dependsOn: "${variant.name}Javadoc") { - classifier = 'javadoc' - from tasks["${variant.name}Javadoc"].destinationDir - } - - // Add the Javadoc jar to the project's artifacts. This will allow us to upload it easily later - project.artifacts.add("archives", tasks["${variant.name}JavadocJar"]); -} +apply from: rootProject.file('gradle/gradle-mvn-push.gradle') diff --git a/aboutit/gradle.properties b/aboutit/gradle.properties new file mode 100644 index 0000000..676bc4a --- /dev/null +++ b/aboutit/gradle.properties @@ -0,0 +1,4 @@ +POM_ARTIFACT_ID=aboutit +POM_NAME=AboutIt +POM_PACKAGING=aar +VERSION_NAME=1.2.2-SNAPSHOT
\ No newline at end of file |