Skip to content

Commit

Permalink
Changed JDK Version from 1.8 to 11 & changed gradle version from 3.1 …
Browse files Browse the repository at this point in the history
…to 4.2.2
  • Loading branch information
rohankulkz committed Jan 18, 2022
1 parent c75b389 commit 53ddc3b
Show file tree
Hide file tree
Showing 9 changed files with 65 additions and 50 deletions.
18 changes: 1 addition & 17 deletions .idea/compiler.xml

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

4 changes: 3 additions & 1 deletion .idea/gradle.xml

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

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

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

26 changes: 23 additions & 3 deletions .idea/misc.xml

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

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

This file was deleted.

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

This file was deleted.

13 changes: 9 additions & 4 deletions app/build.gradle
Original file line number Diff line number Diff line change
@@ -1,14 +1,17 @@
apply plugin: 'com.android.application'

android {
compileSdkVersion 23
compileSdkVersion 28
buildToolsVersion '26.0.2'
defaultConfig {
applicationId "com.example.iris.login1"
minSdkVersion 15
targetSdkVersion 22
versionCode 1
versionName "1.7.5.5"

//Previous was 1.7.5.7 => 1.7.5.6

versionName "1.8.1.1"
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
}

Expand Down Expand Up @@ -62,11 +65,11 @@ android {
variant.outputs.all { output ->
def project = "facelogin"
def SEP = "."
def buildType = variant.variantData.variantConfiguration.buildType.name
def buildType = variant.buildType.name
def version = variant.versionName

def newApkName = project + SEP + buildType + SEP + version + ".apk"
outputFileName = new File(output.outputFile.parent, newApkName)
outputFileName = new File("./../../../../../build/", newApkName)
}
}

Expand All @@ -78,6 +81,8 @@ dependencies {
exclude group: 'com.android.support', module: 'support-annotations'
})
compile 'com.android.support:appcompat-v7:23.4.0'
compile 'com.android.support:appcompat-v7:23.4.0'
//compile 'com.android.support.constraint:constraint-layout:1.0.0-alpha4'
testCompile 'junit:junit:4.12'

}
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ buildscript {
}
dependencies {

classpath 'com.android.tools.build:gradle:3.0.1'
classpath 'com.android.tools.build:gradle:4.2.2'

// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
Expand Down
6 changes: 3 additions & 3 deletions gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#Tue Dec 05 13:11:45 EST 2017
#Thu Jan 13 07:20:57 PST 2022
distributionBase=GRADLE_USER_HOME
distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-bin.zip
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip
zipStoreBase=GRADLE_USER_HOME

0 comments on commit 53ddc3b

Please sign in to comment.