Skip to content

Commit

Permalink
gradle and java update
Browse files Browse the repository at this point in the history
  • Loading branch information
juniorvansuita authored and juniorvansuita committed Jun 16, 2022
1 parent 546711a commit f8bd427
Show file tree
Hide file tree
Showing 14 changed files with 28 additions and 57 deletions.
2 changes: 1 addition & 1 deletion .idea/compiler.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 2 additions & 3 deletions .idea/gradle.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 5 additions & 0 deletions .idea/jarRepositories.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion .idea/misc.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions .idea/modules.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 0 additions & 12 deletions .idea/runConfigurations.xml

This file was deleted.

1 change: 1 addition & 0 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ android {
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
}
}
namespace 'com.vansuita.materialabout.sample'
}

dependencies {
Expand Down
6 changes: 3 additions & 3 deletions app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
package="com.vansuita.materialabout.sample">
xmlns:tools="http://schemas.android.com/tools">

<application
android:allowBackup="true"
Expand All @@ -14,7 +13,8 @@

<activity
android:name=".act.ActivitySample"
android:label="@string/app_name">
android:label="@string/app_name"
android:exported="true">

<intent-filter>
<action android:name="android.intent.action.MAIN" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,6 @@ public void loadAbout() {
.addFacebookLink("user")
.addTwitterLink("user")
.addInstagramLink("jnrvans")
.addGooglePlusLink("+JuniorVansuita")
.addYoutubeChannelLink("CaseyNeistat")
.addDribbbleLink("user")
.addEmailLink("[email protected]")
Expand Down
12 changes: 6 additions & 6 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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'
}

Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
Expand Up @@ -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
4 changes: 1 addition & 3 deletions library/build.gradle
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
apply plugin: 'com.android.library'
apply plugin: 'com.github.dcendents.android-maven'

group = 'com.github.jrvansuita'

Expand All @@ -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 {
Expand Down
3 changes: 1 addition & 2 deletions library/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
<manifest package="com.vansuita.materialabout"
xmlns:android="http://schemas.android.com/apk/res/android">
<manifest xmlns:android="http://schemas.android.com/apk/res/android">

<!--
Package visibility filtering on Android 30+
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -973,30 +973,6 @@ public AboutBuilder addGoogleLink(@Nullable String url) {
return addLink(R.mipmap.google, R.string.google, url);
}

/**
* Adds a Google Plus profile link on the links section
*
* @param user a Google Plus user name
* @return the same {@link AboutBuilder} instance
*/
@NonNull
@Deprecated
public AboutBuilder addGooglePlusLink(@StringRes int user) {
return addGooglePlusLink(context.getString(user));
}

/**
* Adds a Google Plus profile link on the links section
*
* @param user a Google Plus user name or id
* @return the same {@link AboutBuilder} instance
*/
@NonNull
@Deprecated
public AboutBuilder addGooglePlusLink(@NonNull String user) {
return addLink(R.mipmap.google_plus, R.string.google_plus, util.openGooglePlus(user));
}

/**
* Adds a Google Play Store profile link on the links section
*
Expand Down

0 comments on commit f8bd427

Please sign in to comment.