Skip to content

Commit 9768197

Browse files
committed
Merge branch 'develop'
* develop: (180 commits) Updated website expected date Readme: Updated setup section for version 0.0.57 Readme updated. More on new introduction Update README.md Update README.md Update README.md Update README.md Update README.md Update README.md Update README.md Update README.md Update README.md Readme: new animated screenshots added Fixing sonar report job EventBuilder with new severity accessors like MessageBuilder (isInfo, isWarning...) Improve source description at home, and welcome dialog Readme: improve addTeamAction, buildMessage and buildEvent Update README.md MessageActivity with texts from Readme Readme: Contributing and About updated ...
2 parents e3e5495 + 9d39716 commit 9768197

File tree

367 files changed

+19311
-7140
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

367 files changed

+19311
-7140
lines changed

.circleci/config.yml

Lines changed: 17 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
defaults: &defaults
22
docker:
3-
- image: circleci/android:api-28-node
3+
- image: circleci/android:api-29-node
44
working_directory: ~/code
55
environment:
66
JVM_OPTS: -Xmx3200m
@@ -17,10 +17,6 @@ jobs:
1717
- restore_cache:
1818
key: jars-{{ checksum "gradle/wrapper/gradle-wrapper.properties" }}-{{ checksum "build.gradle" }}-{{ checksum "gradle/constants.gradle" }}-{{ checksum "compat/build.gradle" }}-{{ checksum "library/build.gradle" }}-{{ checksum "demo/build.gradle" }}
1919

20-
- run:
21-
name: Download Dependencies
22-
command: ./gradlew androidDependencies
23-
2420
#Not needed: Plugin build already included in project (using includBuild)
2521
#- run:
2622
# name: Assemble Plugin
@@ -29,6 +25,11 @@ jobs:
2925
name: Assemble NOOP Debug
3026
command: ./gradlew :noop:assembleDebug
3127

28+
29+
- run:
30+
name: Download Dependencies
31+
command: ./gradlew androidDependencies -Pandroid.useAndroidX=true -Pandroid.enableJetifier=true
32+
3233
- run:
3334
name: Assemble COMPAT SupportDebug
3435
command: ./gradlew :compat:assembleSupportDebug
@@ -39,6 +40,7 @@ jobs:
3940
name: Assemble DEMO SupportDebug
4041
command: ./gradlew :demo:assembleSupportDebug
4142

43+
4244
- run:
4345
name: Assemble COMPAT AndroidxDebug
4446
command: ./gradlew :compat:assembleAndroidxDebug -Pandroid.useAndroidX=true -Pandroid.enableJetifier=true
@@ -63,23 +65,27 @@ jobs:
6365
key: jars-{{ checksum "gradle/wrapper/gradle-wrapper.properties" }}-{{ checksum "build.gradle" }}-{{ checksum "gradle/constants.gradle" }}-{{ checksum "compat/build.gradle" }}-{{ checksum "library/build.gradle" }}-{{ checksum "demo/build.gradle" }}
6466

6567
- run:
66-
name: Lint report LIBRARY SupportDebug
67-
command: ./gradlew :library:lintSupportDebug
68+
name: Download Dependencies
69+
command: ./gradlew androidDependencies -Pandroid.useAndroidX=true -Pandroid.enableJetifier=true
70+
71+
- run:
72+
name: Lint report LIBRARY Androidx Debug
73+
command: ./gradlew :library:lintAndroidxDebug -Pandroid.useAndroidX=true -Pandroid.enableJetifier=true
6874
- store_artifacts:
6975
name: Saving Lint report
7076
path: library/build/reports
7177
destination: library/reports
7278

7379
- run:
74-
name: Lint report DEMO SupportDebug
75-
command: ./gradlew :demo:lintSupportDebug
80+
name: Lint report DEMO Androidx Debug
81+
command: ./gradlew :demo:lintAndroidxDebug -Pandroid.useAndroidX=true -Pandroid.enableJetifier=true
7682
- store_artifacts:
7783
name: Saving Lint report
7884
path: demo/build/reports
7985
destination: demo/reports
8086
- run:
8187
name: Sonar report ALL SupportDebug and upload to SonarCloud
82-
command: ./gradlew :demo:assembleSupportDebug sonarqube -Dsonar.branch.name=${CIRCLE_BRANCH} --info
88+
command: ./gradlew :demo:assembleSupportDebug sonarqube -Dsonar.branch.name=${CIRCLE_BRANCH} --info -Pandroid.useAndroidX=false -Pandroid.enableJetifier=false
8389

8490
- run: echo "Analized branch" ${CIRCLE_BRANCH}
8591

@@ -93,7 +99,7 @@ jobs:
9399

94100
- run:
95101
name: Download Dependencies
96-
command: ./gradlew androidDependencies
102+
command: ./gradlew androidDependencies -Pandroid.useAndroidX=true -Pandroid.enableJetifier=true
97103

98104
- run: echo "Deploy job is currently DISABLED"
99105
# - run:

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -96,3 +96,4 @@ Temporary Items
9696
.idea/sonarlint/
9797
.idea/markdown-exported-files.xml
9898
.idea/sonarlint-state.xml
99+
.idea/jarRepositories.xml

README.md

Lines changed: 188 additions & 83 deletions
Large diffs are not rendered by default.

build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ buildscript {
88
apply from: './gradle/constants.gradle'
99

1010
dependencies {
11-
classpath 'com.android.tools.build:gradle:3.4.0'
11+
classpath 'com.android.tools.build:gradle:4.0.1'
1212
//classpath 'com.android.tools.build:gradle:3.6.1' //Latest tested
1313

1414
/*
Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
/*
2+
* This source file is part of InAppDevTools, which is available under
3+
* Apache License, Version 2.0 at https://github.com/rafaco/InAppDevTools
4+
*
5+
* Copyright 2018-2020 Rafael Acosta Alvarez
6+
*
7+
* Licensed under the Apache License, Version 2.0 (the "License");
8+
* you may not use this file except in compliance with the License.
9+
* You may obtain a copy of the License at
10+
*
11+
* http://www.apache.org/licenses/LICENSE-2.0
12+
*
13+
* Unless required by applicable law or agreed to in writing, software
14+
* distributed under the License is distributed on an "AS IS" BASIS,
15+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
16+
* See the License for the specific language governing permissions and
17+
* limitations under the License.
18+
*/
19+
20+
package es.rafaco.compat;
21+
22+
import android.content.Context;
23+
import android.util.AttributeSet;
24+
25+
//#ifdef ANDROIDX
26+
//@public class AppCompatImageButton extends androidx.appcompat.widget.AppCompatImageButton {
27+
//#else
28+
public class AppCompatImageButton extends android.support.v7.widget.AppCompatImageButton {
29+
//#endif
30+
31+
public AppCompatImageButton(Context context) {
32+
super(context);
33+
}
34+
35+
public AppCompatImageButton(Context context, AttributeSet attrs) {
36+
super(context, attrs);
37+
}
38+
39+
public AppCompatImageButton(Context context, AttributeSet attrs, int defStyleAttr) {
40+
super(context, attrs, defStyleAttr);
41+
}
42+
}

0 commit comments

Comments
 (0)