diff --git a/.idea/compiler.xml b/.idea/compiler.xml index 571879a..a41bd9e 100644 --- a/.idea/compiler.xml +++ b/.idea/compiler.xml @@ -2,6 +2,6 @@ \ No newline at end of file diff --git a/.idea/gradle.xml b/.idea/gradle.xml index 70ad6cb..4c3b1da 100644 --- a/.idea/gradle.xml +++ b/.idea/gradle.xml @@ -4,9 +4,10 @@ diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml index 105130f..867d0c4 100644 --- a/.idea/jarRepositories.xml +++ b/.idea/jarRepositories.xml @@ -41,5 +41,10 @@ - + diff --git a/.idea/modules.xml b/.idea/modules.xml index b003991..6bcdd6b 100644 --- a/.idea/modules.xml +++ b/.idea/modules.xml @@ -4,7 +4,13 @@ + + + + + + \ No newline at end of file diff --git a/.idea/runConfigurations.xml b/.idea/runConfigurations.xml deleted file mode 100644 index 7f68460..0000000 --- a/.idea/runConfigurations.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index 1d1232e..609b16a 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -19,6 +19,7 @@ android { proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' } } + namespace 'com.vansuita.materialabout.sample' } dependencies { diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index b5bc1bf..13d106c 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -1,7 +1,6 @@ + xmlns:tools="http://schemas.android.com/tools"> + android:label="@string/app_name" + android:exported="true"> diff --git a/app/src/main/java/com/vansuita/materialabout/sample/helper/SampleHelper.java b/app/src/main/java/com/vansuita/materialabout/sample/helper/SampleHelper.java index cf6120d..491d265 100644 --- a/app/src/main/java/com/vansuita/materialabout/sample/helper/SampleHelper.java +++ b/app/src/main/java/com/vansuita/materialabout/sample/helper/SampleHelper.java @@ -58,7 +58,6 @@ public void loadAbout() { .addFacebookLink("user") .addTwitterLink("user") .addInstagramLink("jnrvans") - .addGooglePlusLink("+JuniorVansuita") .addYoutubeChannelLink("CaseyNeistat") .addDribbbleLink("user") .addEmailLink("vansuita.jr@gmail.com") diff --git a/build.gradle b/build.gradle index e7992f3..8cb9166 100644 --- a/build.gradle +++ b/build.gradle @@ -2,31 +2,31 @@ buildscript { repositories { - jcenter() + mavenCentral() google() } dependencies { - classpath 'com.android.tools.build:gradle:4.1.3' + classpath 'com.android.tools.build:gradle:7.2.1' classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1' } } allprojects { repositories { - jcenter() + mavenCentral() maven { url "https://jitpack.io" } google() } } ext { - compileSdkVersion = 30 + compileSdkVersion = 31 buildToolsVersion = '30.0.3' targetSdkVersion = compileSdkVersion - appcompatLibVersion = '1.2.0' + appcompatLibVersion = '1.4.2' cardViewLibVersion = '1.0.0' - materialLibVersion = '1.3.0' + materialLibVersion = '1.6.1' iconHandlerVersion = 'v2.0.0' } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 4586e80..b45d08e 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-all.zip diff --git a/library/build.gradle b/library/build.gradle index 24e2893..f720978 100644 --- a/library/build.gradle +++ b/library/build.gradle @@ -1,5 +1,4 @@ apply plugin: 'com.android.library' -apply plugin: 'com.github.dcendents.android-maven' group = 'com.github.jrvansuita' @@ -10,13 +9,12 @@ android { defaultConfig { minSdkVersion 14 targetSdkVersion rootProject.ext.targetSdkVersion - versionCode 1 - versionName "1.0" } sourceSets { main.res.srcDirs 'res' } + namespace 'com.vansuita.materialabout' } dependencies { diff --git a/library/src/main/AndroidManifest.xml b/library/src/main/AndroidManifest.xml index 49ca9da..2909763 100644 --- a/library/src/main/AndroidManifest.xml +++ b/library/src/main/AndroidManifest.xml @@ -1,5 +1,4 @@ - +