Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
16 changes: 8 additions & 8 deletions ScalarApiSampleApp/app/build.gradle
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
apply plugin: 'com.android.application'

android {
compileSdkVersion 27
compileSdkVersion 29

defaultConfig {
applicationId "com.google.android.apps.forscience.scalarapisampleapp"
minSdkVersion 19
targetSdkVersion 27
targetSdkVersion 29
versionCode 1
versionName "1.0"
}
Expand All @@ -22,13 +22,13 @@ android {
dependencies {
// Uncomment one of the following two lines.
// 1) For local rapid development on the API files themselves
// compile project(':scalarinputapi')
// implementation project(':scalarinputapi')
implementation fileTree(dir: 'libs', include: ['*.jar'])

// 2) To download and build against the official public API library
compile 'com.google.android.apps.forscience:science-journal-api:0.2'
implementation 'com.google.android.apps.forscience:science-journal-api:0.2'
implementation "androidx.appcompat:appcompat:1.2.0"

compile fileTree(dir: 'libs', include: ['*.jar'])
testCompile 'junit:junit:4.12'
compile 'com.android.support:appcompat-v7:27.0.1'
compile 'com.google.guava:guava:18.0'
testImplementation 'junit:junit:4.12'
implementation 'com.google.guava:guava:18.0'
}
2 changes: 1 addition & 1 deletion ScalarApiSampleApp/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ buildscript {
google()
}
dependencies {
classpath 'com.android.tools.build:gradle:3.0.0'
classpath 'com.android.tools.build:gradle:4.1.3'

// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
Expand Down
4 changes: 3 additions & 1 deletion ScalarApiSampleApp/gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,6 @@
# 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
# org.gradle.parallel=true
# org.gradle.parallel=true
android.useAndroidX=true
android.enableJetifier=true
4 changes: 2 additions & 2 deletions ScalarApiSampleApp/gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#Wed Dec 20 09:58:36 EST 2017
#Thu Apr 29 15:04:19 CEST 2021
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-bin.zip
6 changes: 3 additions & 3 deletions api/ScienceJournalApi/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -6,16 +6,16 @@ buildscript {
google()
}
dependencies {
classpath 'com.android.tools.build:gradle:3.5.2'
classpath 'com.android.tools.build:gradle:4.1.3'
}
}

android {
compileSdkVersion 28
compileSdkVersion 29

defaultConfig {
minSdkVersion 19
targetSdkVersion 28
targetSdkVersion 29
versionCode 1
versionName "1.0"
}
Expand Down