Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgraded gradle and substituted previously used features #2294

Merged
merged 3 commits into from
Jan 10, 2022
Merged

Upgraded gradle and substituted previously used features #2294

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e6e273c
Upgraded gradle and substituted previously used feaatures
apoorva-raj Dec 25, 2021
eb5b02b
Update build.gradle
apoorva-raj Jan 10, 2022
8c038e0
Update build.gradle
apoorva-raj Jan 10, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 2 additions & 6 deletions app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,14 +76,14 @@ dependencies {
implementation fileTree(include: ['*.jar'], dir: 'libs')

// Android stock libraries
implementation 'androidx.appcompat:appcompat:1.3.1'
implementation 'androidx.appcompat:appcompat:1.4.0'
implementation 'androidx.cardview:cardview:1.0.0'
implementation 'androidx.recyclerview:recyclerview:1.2.1'
implementation 'com.google.android.material:material:1.4.0'
implementation 'androidx.legacy:legacy-support-v13:1.0.0'
implementation 'androidx.legacy:legacy-support-v4:1.0.0'
implementation 'androidx.legacy:legacy-preference-v14:1.0.0'
implementation 'androidx.browser:browser:1.3.0'
implementation 'androidx.browser:browser:1.4.0'
implementation 'androidx.constraintlayout:constraintlayout:2.1.2'

// Custom tools libraries
Expand Down Expand Up @@ -121,7 +121,6 @@ dependencies {

implementation 'androidx.multidex:multidex:2.0.1'
implementation "io.realm:android-adapters:$rootProject.realmAdapter"

testImplementation "junit:junit:$rootProject.junitVersion"
androidTestImplementation('androidx.test.ext:junit:1.1.3') {
exclude group: 'com.android.support', module: 'support-annotations'
Expand All @@ -142,7 +141,4 @@ dependencies {
exclude group: 'com.android.support', module: 'appcompat-v7'
exclude group: 'com.android.support', module: 'design'
}

implementation 'com.android.support:appcompat-v7:28.0.0'
implementation 'com.android.support:design:28.0.0'
}
6 changes: 4 additions & 2 deletions app/src/main/AndroidManifest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,8 @@
<activity
android:name=".activity.SplashActivity"
android:screenOrientation="user"
android:theme="@style/AppThemeSplash">
android:theme="@style/AppThemeSplash"
android:exported="true">
<intent-filter>
<action android:name="android.intent.action.MAIN" />

Expand All @@ -54,7 +55,8 @@
<activity
android:name=".activity.MainActivity"
android:configChanges="orientation|screenSize|keyboardHidden"
android:launchMode="singleTask">
android:launchMode="singleTask"
android:exported="false">
<intent-filter>
<action android:name="android.hardware.usb.action.USB_DEVICE_ATTACHED" />
</intent-filter>
Expand Down
16 changes: 10 additions & 6 deletions build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,26 +3,30 @@
buildscript {

repositories {
jcenter()
google()
mavenCentral()
maven { url "https://jitpack.io" }
maven { url "https://plugins.gradle.org/m2/" }
}
dependencies {
classpath 'com.android.tools.build:gradle:7.0.3'
classpath 'com.android.tools.build:gradle:7.0.4'
classpath "io.realm:realm-gradle-plugin:10.8.1"
classpath "gradle.plugin.com.github.b3er.local.properties:local-properties-plugin:1.1"
// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
}
}


allprojects {
repositories {
jcenter()
google()
mavenCentral()
maven { url "https://jitpack.io" }
maven { url "https://plugins.gradle.org/m2/" }
}
}
}


task clean(type: Delete) {
delete rootProject.buildDir
Expand All @@ -32,8 +36,8 @@ task clean(type: Delete) {
ext {
// Sdk and tools
minSdkVersion = 23
targetSdkVersion = 28
compileSdkVersion = 28
targetSdkVersion = 31
compileSdkVersion = 31

// App dependencies
androidAboutPageVersion = '1.3.1'
Expand Down
1 change: 1 addition & 0 deletions gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ google_key = "AIzaSyBFvrqI8_J108WntI7surDGqCUcd1RbHPQ"
android.useAndroidX=true
android.enableJetifier=true
kapt.incremental.apt=true
org.gradle.warning.mode=all
# When configured, Gradle will run in incubating parallel mode.
# This option should only be used with decoupled projects. More details, visit
# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
Expand Down