Skip to content
This repository was archived by the owner on Jul 13, 2026. It is now read-only.

Commit 5cd9b86

Browse files
anggrayudianggrayudi
authored
Release/3.8.0 (#25)
* Upgrade to AGP 7 & Kotlin 1.7 * Update publishing library * Fix CI * Removed Dexter * Fix CI * Fixed CI vulnerabilities * Removed deprecated APIs * Added publishAllToCentral * Enable signing * Update copyrights * compile only annotation
1 parent 34b2b88 commit 5cd9b86

26 files changed

Lines changed: 269 additions & 232 deletions

File tree

‎.github/scripts/copy_env_variables.sh‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
11
# Append suffix -SNAPSHOT
22
if [[ ! ($(grep "MATERIAL_PREFERENCE_VERSION=" gradle.properties) == *"-SNAPSHOT") ]]; then
33
sed -ie "s/MATERIAL_PREFERENCE_VERSION.*$/&-SNAPSHOT/g" gradle.properties
4+
fi
5+
6+
if [[ ! ($(grep "PROCESSOR_VERSION=" gradle.properties) == *"-SNAPSHOT") ]]; then
7+
sed -ie "s/PROCESSOR_VERSION.*$/&-SNAPSHOT/g" gradle.properties
48
rm -f gradle.propertiese
59
fi
610

‎.github/scripts/deploy_snapshot.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,6 @@ elif [ "${GITHUB_REF##*/}" != "master" ]; then
1010
echo "Skipping deployment: wrong branch. Expected 'master' but was '${GITHUB_REF##*/}'."
1111
else
1212
echo "Deploying snapshot..."
13-
./gradlew :materialpreference:uploadArchives --no-daemon --no-parallel --stacktrace
13+
./gradlew :materialpreference:publishAllPublicationsToMavenCentral --no-daemon --no-parallel --stacktrace
1414
echo "Snapshot released!"
1515
fi

‎.github/workflows/android.yml‎

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,19 +19,31 @@ jobs:
1919
steps:
2020
- uses: actions/checkout@v2
2121

22-
- name: Setup JDK 1.8
22+
- name: Setup JDK 11
2323
uses: actions/setup-java@v1
2424
with:
25-
java-version: 1.8
25+
java-version: 11
2626

2727
- name: Copy environment variables
2828
run: ./.github/scripts/copy_env_variables.sh
2929

3030
- name: Build with Gradle
31+
if: ${{ github.repository_owner == 'anggrayudi' }}
32+
env:
33+
ORG_GRADLE_PROJECT_mavenCentralUsername: ${{ secrets.OSS_SONATYPE_NEXUS_USERNAME }}
34+
ORG_GRADLE_PROJECT_mavenCentralPassword: ${{ secrets.OSS_SONATYPE_NEXUS_PASSWORD }}
35+
run: ./gradlew build test check
36+
37+
- name: Build with Gradle (default)
38+
if: ${{ github.repository_owner != 'anggrayudi' }}
39+
env:
40+
ORG_GRADLE_PROJECT_mavenCentralUsername: 'abc'
41+
ORG_GRADLE_PROJECT_mavenCentralPassword: 'xyz'
3142
run: ./gradlew build test check
3243

3344
- name: Upload snapshot archives
45+
if: ${{ github.repository_owner == 'anggrayudi' }}
3446
env:
3547
ORG_GRADLE_PROJECT_mavenCentralUsername: ${{ secrets.OSS_SONATYPE_NEXUS_USERNAME }}
3648
ORG_GRADLE_PROJECT_mavenCentralPassword: ${{ secrets.OSS_SONATYPE_NEXUS_PASSWORD }}
37-
run: ./.github/scripts/deploy_snapshot.sh
49+
run: ./.github/scripts/deploy_snapshot.sh

‎.run/publish.run.xml‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
<component name="ProjectRunConfigurationManager">
2+
<configuration default="false" name="publishMaterialPreferenceToCentral" type="ShConfigurationType">
3+
<option name="SCRIPT_TEXT" value="./gradlew :materialpreference:publishAllPublicationsToMavenCentral" />
4+
<option name="INDEPENDENT_SCRIPT_PATH" value="true" />
5+
<option name="SCRIPT_PATH" value="" />
6+
<option name="SCRIPT_OPTIONS" value="" />
7+
<option name="INDEPENDENT_SCRIPT_WORKING_DIRECTORY" value="true" />
8+
<option name="SCRIPT_WORKING_DIRECTORY" value="$PROJECT_DIR$" />
9+
<option name="INDEPENDENT_INTERPRETER_PATH" value="true" />
10+
<option name="INTERPRETER_PATH" value="/bin/zsh" />
11+
<option name="INTERPRETER_OPTIONS" value="" />
12+
<option name="EXECUTE_IN_TERMINAL" value="true" />
13+
<option name="EXECUTE_SCRIPT_FILE" value="false" />
14+
<envs />
15+
<method v="2" />
16+
</configuration>
17+
</component>

‎.run/publishAllToCentral.run.xml‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
<component name="ProjectRunConfigurationManager">
2+
<configuration default="false" name="publishAllToCentral" type="ShConfigurationType">
3+
<option name="SCRIPT_TEXT" value="./gradlew publishAllPublicationsToMavenCentral" />
4+
<option name="INDEPENDENT_SCRIPT_PATH" value="true" />
5+
<option name="SCRIPT_PATH" value="" />
6+
<option name="SCRIPT_OPTIONS" value="" />
7+
<option name="INDEPENDENT_SCRIPT_WORKING_DIRECTORY" value="true" />
8+
<option name="SCRIPT_WORKING_DIRECTORY" value="$PROJECT_DIR$" />
9+
<option name="INDEPENDENT_INTERPRETER_PATH" value="true" />
10+
<option name="INTERPRETER_PATH" value="/bin/zsh" />
11+
<option name="INTERPRETER_OPTIONS" value="" />
12+
<option name="EXECUTE_IN_TERMINAL" value="true" />
13+
<option name="EXECUTE_SCRIPT_FILE" value="false" />
14+
<envs />
15+
<method v="2" />
16+
</configuration>
17+
</component>

‎.run/publishToLocal.run.xml‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
<component name="ProjectRunConfigurationManager">
2+
<configuration default="false" name="publishAllToLocal" type="ShConfigurationType">
3+
<option name="SCRIPT_TEXT" value="./gradlew publishToMavenLocal" />
4+
<option name="INDEPENDENT_SCRIPT_PATH" value="true" />
5+
<option name="SCRIPT_PATH" value="" />
6+
<option name="SCRIPT_OPTIONS" value="" />
7+
<option name="INDEPENDENT_SCRIPT_WORKING_DIRECTORY" value="true" />
8+
<option name="SCRIPT_WORKING_DIRECTORY" value="$PROJECT_DIR$" />
9+
<option name="INDEPENDENT_INTERPRETER_PATH" value="true" />
10+
<option name="INTERPRETER_PATH" value="/bin/zsh" />
11+
<option name="INTERPRETER_OPTIONS" value="" />
12+
<option name="EXECUTE_IN_TERMINAL" value="true" />
13+
<option name="EXECUTE_SCRIPT_FILE" value="false" />
14+
<envs />
15+
<method v="2" />
16+
</configuration>
17+
</component>

‎LICENSE‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,7 @@
186186
same "printed page" as the copyright notice for easier
187187
identification within third-party archives.
188188

189-
Copyright © 2018-2021 Anggrayudi Hardiannicko A.
189+
Copyright © 2018-2022 Anggrayudi Hardiannicko A.
190190

191191
Licensed under the Apache License, Version 2.0 (the "License");
192192
you may not use this file except in compliance with the License.

‎README.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,7 @@ apply plugin: 'kotlin-kapt' // Add this line
163163
164164
dependencies {
165165
implementation 'com.anggrayudi:materialpreference:3.x.x'
166-
kapt 'com.anggrayudi:materialpreference-compiler:1.7'
166+
kapt 'com.anggrayudi:materialpreference-compiler:1.8'
167167
}
168168
````
169169

@@ -328,7 +328,7 @@ Don't forget to check this runtime permission before opening ringtone picker on
328328

329329
## License
330330

331-
Copyright 2018-2021 Anggrayudi Hardiannicko A.
331+
Copyright 2018-2022 Anggrayudi Hardiannicko A.
332332

333333
Licensed under the Apache License, Version 2.0 (the "License");
334334
you may not use this file except in compliance with the License.

‎annotation/build.gradle‎

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
apply plugin: 'java-library'
22
apply plugin: 'kotlin'
33

4-
group = 'com.anggrayudi'
54
version = "$PROCESSOR_VERSION"
6-
archivesBaseName = 'materialpreference-api'
5+
archivesBaseName = "$POM_ARTIFACT_ID"
76

87
compileKotlin {
98
kotlinOptions {
@@ -18,14 +17,7 @@ compileTestKotlin {
1817
}
1918
}
2019

21-
ext {
22-
// POM
23-
POM_ARTIFACT_ID = archivesBaseName
24-
VERSION_NAME = version
25-
26-
POM_NAME = archivesBaseName
27-
POM_PACKAGING = 'jar'
28-
POM_DESCRIPTION = 'Annotation processor API for library MaterialPreference.'
20+
java {
21+
sourceCompatibility = JavaVersion.VERSION_1_8
22+
targetCompatibility = JavaVersion.VERSION_1_8
2923
}
30-
31-
apply plugin: "com.vanniktech.maven.publish"

‎annotation/gradle.properties‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
POM_ARTIFACT_ID=materialpreference-api
2+
POM_NAME=materialpreference-api
3+
POM_DESCRIPTION=Annotation processor API for library MaterialPreference.

0 commit comments

Comments
 (0)