diff --git a/app/build.gradle b/app/build.gradle index 0e07c31d3..cded6cbe5 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -3,7 +3,6 @@ apply plugin: 'com.android.application' android { compileSdkVersion rootProject.ext.rtCompileSdkVersion - buildToolsVersion rootProject.ext.rtBuildToolsVersion defaultConfig { applicationId "cmu.xprize.robotutor" minSdkVersion rootProject.ext.rtMinSdkVersion @@ -85,12 +84,8 @@ android { } repositories { - google() mavenCentral() - // Added the custom Maven repository for utilcode - maven { - url 'http://maven.xdja.com:8081/nexus3/repository/aliyun/' - } + } dependencies { @@ -136,7 +131,7 @@ dependencies { implementation project(path: ':comp_intervention') // Dependency resolved from custom Maven repository - implementation 'com.blankj:utilcode:1.24.4' + implementation 'com.blankj:utilcode:1.30.7' // External libraries implementation 'com.github.RoboTutorLLC:ScreenRecordHelper:1.0.0' diff --git a/app/src/main/assets/tutors/bubble_pop/animator_graph.json b/app/src/main/assets/tutors/bubble_pop/animator_graph.json index 5fd7207dc..fb5396ac5 100644 --- a/app/src/main/assets/tutors/bubble_pop/animator_graph.json +++ b/app/src/main/assets/tutors/bubble_pop/animator_graph.json @@ -50,7 +50,7 @@ "COMMENT": "When module is complete - move to next scene in the scenegraph", "maptype":"moduleMap", "mapname": "USERINPUT", - "preenter": [], + "preenter": ["SHOW_TOAST"], "preexit": [], "edges": [ { @@ -160,14 +160,11 @@ {"name": "LOG_EVENT", "type": "QUEUEDCOMMAND", "id": "SBubblePop", "method": "logState", "parms": "type#node,value#INTROSTATE:String", "features":""}, {"type": "AUDIO", "command": "PLAY", "soundsource": "{{SBubblePop.sound_track}}", "soundpackage":"tutor_effect", "repeat":true, "volume": 0.10, "mode":"event", "features": ""}, - {"type": "AUDIO", "command": "PLAY", "soundsource": "Please tap on it.mp3", "soundpackage":"default", "volume": 0.7, "mode":"flow", "features": ""} + {"type": "AUDIO", "command": "PLAY", "soundsource": "Please tap.mp3", "soundpackage":"default", "volume": 0.7, "mode":"flow", "features": ""} ] }, - // Here we manage the Stimulus display. - // We are either going to Speak the Stimulus / Show the Stimulus / Both or Neither - - // JUDITH trigger the hesitation here... "UPDATESTIMULUS": { "type": "MODULE", "reuse":true, @@ -176,7 +173,6 @@ {"type": "COMMAND", "id": "SBubblePop", "method": "postEvent", "parms": "SHOW_STIMULUS:String" , "features":"FTR_SHOW"}, - // ND_SCAFFOLD NEXT(1) make sure to check for correct features {"type": "AUDIO", "command": "PLAY", "soundsource": "{{SBubblePop.questValue}}.mp3", "soundpackage":"missing_number", "volume": 1.0, "mode":"event", "features": "FTR_SAY&FTR_MIS_NUM"}, {"type": "AUDIO", "command": "PLAY", "soundsource": "{{SBubblePop.questValue}}.mp3", "soundpackage":"missing_number", "volume": 1.0, "mode":"event", "features": "FTR_SAY&FTR_GT_LT"}, {"type": "AUDIO", "command": "PLAY", "soundsource": "Neno gani huanza na.mp3", "soundpackage":"xprize", "volume": 1.0, "mode":"flow", "features": "FTR_SAY&FTR_WORDS&FTR_WORD_STARTS_WITH"}, @@ -199,11 +195,6 @@ {"type": "AUDIO", "command": "PLAY", "soundsource": "{{SBubblePop.questValueTens}}.mp3", "soundpackage":"numbers", "volume": 1.0, "mode":"flow", "features": "FTR_SAY&FTR_N2E&FTR_QUEST_TENS"}, - //{"type": "COMMAND", "id": "SBubblePop", "method": "setVolatileBehavior", "parms": "STIMULUS_SHOWN:String|NEXTNODE:String" , "features":"FTR_SHOW&!(FTR_SAY&(FTR_E2N|FTR_WORD_STARTS_WITH|FTR_WORD_ENDS_WITH|FTR_GT_LT|FTR_QUEST_HUNDREDS|FTR_WORDS))"}, - - //If we are showing it we have to wait for the animation to complete before continuing - //Only wait for non expression or short numbers (without hundreds) which are spoken - // {"type": "COMMAND", "id": "SBubblePop", "method": "setVolatileBehavior", "parms": "STIMULUS_SHOWN:String|NEXTNODE:String" , "features":"FTR_SHOW&FTR_SAY&FTR_LETTERS"}, {"type": "COMMAND", "id": "SBubblePop", "method": "postEvent", "parms": "SHOW_BUBBLES:String" ,"features":""} @@ -222,6 +213,15 @@ {"type": "COMMAND", "cmd": "WAIT" } ] }, + "PLAY_PROMPT": { + "type": "AUDIO", + "command": "PLAY", + "soundsource": "Please tap on it.mp3", + "soundpackage": "default", + "volume": 0.7, + "mode": "flow", + "features": "" + }, "PLAYCORRECT": { @@ -249,18 +249,6 @@ {"type": "AUDIO", "command": "PLAY", "soundsource": "{{SBubblePop.ansValueHundreds}}.mp3", "soundpackage":"numbers", "volume": 1.0, "mode":"flow", "features": "FTR_E2N&FTR_ANS_HUNDREDS"}, {"type": "AUDIO", "command": "PLAY", "soundsource": "Na.mp3", "soundpackage":"xprize", "volume": 1.0, "mode":"flow", "features": "FTR_E2N&FTR_ANS_HUNDREDS&FTR_ANS_TENS"}, {"type": "AUDIO", "command": "PLAY", "soundsource": "{{SBubblePop.ansValueTens}}.mp3", "soundpackage":"numbers", "volume": 1.0, "mode":"flow", "features": "FTR_E2N&FTR_ANS_TENS"}, -// Not saying the correct answer when user gets N2E correct since it takes too long -// {"type": "AUDIO", "command": "PLAY", "soundsource": "{{SBubblePop.ansValueStimOneHundreds}}.mp3", "soundpackage":"numbers", "volume": 1.0, "mode":"flow", "features": "FTR_N2E&FTR_ANS_STIM_ONE_HUNDREDS"}, -// {"type": "AUDIO", "command": "PLAY", "soundsource": "Na.mp3", "soundpackage":"numbers", "volume": 1.0, "mode":"flow", "features": "FTR_N2E&FTR_ANS_STIM_ONE_HUNDREDS"}, -// {"type": "AUDIO", "command": "PLAY", "soundsource": "{{SBubblePop.ansValueStimOneTens}}.mp3", "soundpackage":"numbers", "volume": 1.0, "mode":"flow", "features": "FTR_N2E&FTR_ANS_STIM_ONE_TENS"}, -// {"type": "AUDIO", "command": "PLAY", "soundsource": "Na.mp3", "soundpackage":"xprize", "volume": 1.0, "mode":"flow", "features": "FTR_N2E&FTR_ANS_STIM_ONE_TENS"}, -// {"type": "AUDIO", "command": "PLAY", "soundsource": "{{SBubblePop.ansValueStimOneOnes}}.mp3", "soundpackage":"numbers", "volume": 1.0, "mode":"flow", "features": "FTR_N2E&FTR_ANS_STIM_ONE_ONES"}, -// {"type": "AUDIO", "command": "PLAY", "soundsource": "{{SBubblePop.ansValueOperand}}.mp3", "soundpackage":"xprize", "volume": 1.0, "mode":"flow", "features": "FTR_N2E"}, -// {"type": "AUDIO", "command": "PLAY", "soundsource": "{{SBubblePop.ansValueStimTwoHundreds}}.mp3", "soundpackage":"numbers", "volume": 1.0, "mode":"flow", "features": "FTR_N2E&FTR_ANS_STIM_TWO_HUNDREDS"}, -// {"type": "AUDIO", "command": "PLAY", "soundsource": "Na.mp3", "soundpackage":"xprize", "volume": 1.0, "mode":"flow", "features": "FTR_N2E&FTR_ANS_STIM_TWO_HUNDREDS"}, -// {"type": "AUDIO", "command": "PLAY", "soundsource": "{{SBubblePop.ansValueStimTwoTens}}.mp3", "soundpackage":"numbers", "volume": 1.0, "mode":"flow", "features": "FTR_N2E&FTR_ANS_STIM_TWO_TENS"}, -// {"type": "AUDIO", "command": "PLAY", "soundsource": "Na.mp3", "soundpackage":"xprize", "volume": 1.0, "mode":"flow", "features": "FTR_N2E&FTR_ANS_STIM_TWO_TENS"}, -// {"type": "AUDIO", "command": "PLAY", "soundsource": "{{SBubblePop.ansValueStimTwoOnes}}.mp3", "soundpackage":"numbers", "volume": 1.0, "mode":"flow", "features": "FTR_N2E&FTR_ANS_STIM_TWO_ONES"}, {"type": "AUDIO", "command": "PLAY", "soundsource": "{{SBubblePop.ansValue}}.mp3", "soundpackage":"letters", "volume": 1.0, "mode":"event", "features": "FTR_LETTERS"}, {"type": "AUDIO", "command": "PLAY", "soundsource": "{{SBubblePop.ansValue}}.mp3", "soundpackage":"shapes", "volume": 1.0, "mode":"event", "features": "FTR_SHAPES"}, @@ -350,10 +338,7 @@ {"type": "COMMAND", "cmd": "WAIT" ,"features":"FTR_LASTATTEMPT" }, {"type": "COMMAND", "id": "SBubblePop", "method": "postEvent", "parms": "HIDE_MASK:String" ,"features":"FTR_LASTATTEMPT"} - // TODO: is this delay required removed in 45.1 - // - // {"type": "TIMER", "id":"nextDelayTimer", "startdelay":"0", "period":"50", "repeat":"false", "action":"CREATEANDSTART", "ontimer":"NEXTNODE", "features": "" }, - // {"type": "COMMAND", "cmd": "WAIT" } + ] }, @@ -388,17 +373,31 @@ "COMMENT": "@@@@@ CActions @@@@@ ", "PLAY_BACKINGTRACK": {"type": "AUDIO", "command": "PLAY", "soundsource": "{{SBubblePop.sound_track}}", "soundpackage":"tutor_effect", "repeat":true, "volume": 0.20, "mode":"event", "features": ""}, - "PLAY_PROMPT": {"type": "AUDIO", "command": "PLAY", "soundsource": "Please tap on it.mp3", "soundpackage":"default", "volume": 0.7, "mode":"flow", "features": ""}, + "PLAY_AUDIO": { + "type": "AUDIO", + "command": "PLAY", + "soundsource": "tutors/trackdata/LIBRARY/audio/en/cmu/xprize/bubble_pop/Please tap.mp3", + "soundpackage": "default", + "repeat": false, + "volume": 0.70, + "mode": "event", + "features": "" + }, "SET_VERSION":{"type": "COMMAND", "id": "Sbanner", "method": "setVersionID", "parms": "v.0.0.1:String","features":""}, "SET_DATASOURCE":{"type": "COMMAND", "id": "SBubblePop", "method": "setDataSource", "parms": "[file]bp_data.json:String","features":"!DATA_SBUBBLEPOP"}, "SET_SOUND_TRACK":{"type": "COMMAND", "id": "SBubblePop", "method": "setSoundTrack"}, "NEXT_DATASET":{"type": "COMMAND", "id": "SBubblePop", "method": "next" ,"features":""}, + "SHOW_TOAST": { + "type": "COMMAND", + "id": "SBubblePop", + "method": "showToast", + "params": "Please Tap:String", + "features": "" + }, - // "SET_SHOW":{"type": "COMMAND", "id": "SBubblePop", "method": "setEventBehavior" ,"features":""}, - "NEXTNODE": {"type": "COMMAND", "cmd": "NEXT" }, "B5_ATTACH": { diff --git a/app/src/main/assets/tutors/bubble_pop/tutor_descriptor.json b/app/src/main/assets/tutors/bubble_pop/tutor_descriptor.json index fdf06a261..5bcf7131f 100644 --- a/app/src/main/assets/tutors/bubble_pop/tutor_descriptor.json +++ b/app/src/main/assets/tutors/bubble_pop/tutor_descriptor.json @@ -1,5 +1,5 @@ { - //"language":"LANG_EN", + // "language":"LANG_EN", "scenedata": [ { diff --git a/app/src/main/assets/tutors/engine_descriptor.json b/app/src/main/assets/tutors/engine_descriptor.json index 3028f3eac..f95c291c9 100644 --- a/app/src/main/assets/tutors/engine_descriptor.json +++ b/app/src/main/assets/tutors/engine_descriptor.json @@ -12,7 +12,7 @@ // Set the default language for the tutors // - "language":"LANG_SW", + "language":"LANG_EN", // This maps a "variant" i.e. arbitrary name to the tutor/featureset that define a diff --git a/app/src/main/java/cmu/xprize/robotutor/tutorengine/widgets/core/TBpComponent.java b/app/src/main/java/cmu/xprize/robotutor/tutorengine/widgets/core/TBpComponent.java index 1400d1a95..873dd9473 100644 --- a/app/src/main/java/cmu/xprize/robotutor/tutorengine/widgets/core/TBpComponent.java +++ b/app/src/main/java/cmu/xprize/robotutor/tutorengine/widgets/core/TBpComponent.java @@ -298,17 +298,17 @@ public void setDataSource(String dataNameDescriptor) { /** * Chooses one track randomly out of a list kept in string.xml */ - public void setSoundTrack() { - - Resources res = getResources(); - String[] sound_tracks = res.getStringArray(cmu.xprize.bp_component.R.array.sound_tracks); - Random rand = new Random(); - String sound_track = sound_tracks[rand.nextInt(sound_tracks.length)]; - - Log.i("BPOP", "Chosen sound track: " + sound_track); - - publishValue(BP_CONST.SOUND_TRACK, sound_track); - } +// public void setSoundTrack() { +// +// Resources res = getResources(); +// String[] sound_tracks = res.getStringArray(cmu.xprize.bp_component.R.array.sound_tracks); +// Random rand = new Random(); +// String sound_track = sound_tracks[rand.nextInt(sound_tracks.length)]; +// +// Log.i("BPOP", "Chosen sound track: " + sound_track); +// +// publishValue(BP_CONST.SOUND_TRACK, sound_track); +// } // Override in child class diff --git a/app/src/sample_config_files/dbg_english.json b/app/src/sample_config_files/dbg_english.json index b68de2d91..6eaa16bd0 100644 --- a/app/src/sample_config_files/dbg_english.json +++ b/app/src/sample_config_files/dbg_english.json @@ -1,10 +1,10 @@ { "config_version": "release_dbg", - "language_override": false, + "language_override": true, "show_tutorversion": true, "show_debug_launcher": true, "language_switcher": true, "no_asr_apps": false, - "language_feature_id": "LANG_NULL", + "language_feature_id": "LANG_EN", "show_demo_vids": true } \ No newline at end of file diff --git a/app/src/sample_config_files/debug/config.json b/app/src/sample_config_files/debug/config.json index 1c94202e6..d55f8d5de 100644 --- a/app/src/sample_config_files/debug/config.json +++ b/app/src/sample_config_files/debug/config.json @@ -3,9 +3,9 @@ "language_override": true, "show_tutorversion": true, "show_debug_launcher": true, - "language_switcher": false, + "language_switcher": true, "no_asr_apps": false, - "language_feature_id": "LANG_SW", + "language_feature_id": "LANG_EN", "show_demo_vids": false, "use_placement": false, "record_audio": false, diff --git a/app/src/sample_config_files/release.json b/app/src/sample_config_files/release.json index 85eb4a471..9d24bb904 100644 --- a/app/src/sample_config_files/release.json +++ b/app/src/sample_config_files/release.json @@ -1,10 +1,10 @@ { "config_version": "release", - "language_override": false, + "language_override": true, "show_tutorversion": true, "show_debug_launcher": true, "language_switcher": true, "no_asr_apps": false, - "language_feature_id": "LANG_NULL", + "language_feature_id": "LANG_EN", "show_demo_vids": false } \ No newline at end of file diff --git a/app/src/sample_config_files/release_dbg.json b/app/src/sample_config_files/release_dbg.json index 3ae3366e9..4b36ac143 100644 --- a/app/src/sample_config_files/release_dbg.json +++ b/app/src/sample_config_files/release_dbg.json @@ -1,10 +1,10 @@ { "config_version": "release_dbg", - "language_override": false, + "language_override": true, "show_tutorversion": true, "show_debug_launcher": true, "language_switcher": true, "no_asr_apps": false, - "language_feature_id": "LANG_NULL", + "language_feature_id": "LANG_EN", "show_demo_vids": false } \ No newline at end of file diff --git a/app/src/sample_config_files/release_dbg/config.json b/app/src/sample_config_files/release_dbg/config.json index e54e4ecb7..37377a749 100644 --- a/app/src/sample_config_files/release_dbg/config.json +++ b/app/src/sample_config_files/release_dbg/config.json @@ -1,11 +1,11 @@ { "config_version": "release_dbg", - "language_override": false, + "language_override": true, "show_tutorversion": true, "show_debug_launcher": true, "menu_type": "CD1", "language_switcher": true, "no_asr_apps": false, - "language_feature_id": "LANG_NULL", + "language_feature_id": "LANG_EN", "show_demo_vids": true } \ No newline at end of file diff --git a/app/src/sample_config_files/release_en.json b/app/src/sample_config_files/release_en.json index 6e2858075..a552987d2 100644 --- a/app/src/sample_config_files/release_en.json +++ b/app/src/sample_config_files/release_en.json @@ -7,7 +7,7 @@ "show_debug_launcher": true, "language_switcher": true, "no_asr_apps": false, - "language_feature_id": "LANG_SW", + "language_feature_id": "LANG_EN", "show_demo_vids": false, "show_helper_button": false, "record_screen_video": true, diff --git a/build.gradle b/build.gradle index 1505c61a0..c9232ba7f 100644 --- a/build.gradle +++ b/build.gradle @@ -6,7 +6,8 @@ buildscript { google() } dependencies { - classpath 'com.android.tools.build:gradle:4.1.3' + + classpath 'com.android.tools.build:gradle:7.4.2' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files @@ -22,15 +23,9 @@ allprojects { google() } - dependencies { - modules { - module("com.google.android:flexbox") { - replacedBy("com.google.android.flexbox:flexbox") - } - } - } - // Global variables common to all modules + // see: http://tools.android.com/tech-docs/new-build-system/tips + // ext { rtCompileSdkVersion=29 //Integer rtBuildToolsVersion="26.0.1" //String @@ -39,17 +34,23 @@ allprojects { // Note that using target version 22 bypasses the new run-time permissions found // in Marshmallow 23 + // rtTargetSdkVersion=22 rtVersionCode=1 // Semantic versioning description: // + + rtVersionName="3.5.0.1" //TODO: move this out of build so we don't have to rebuild to unzip assets + } } task clean(type: Delete) { delete rootProject.buildDir } + + diff --git a/comp_akira/build.gradle b/comp_akira/build.gradle index 811be40b2..aada64fbf 100644 --- a/comp_akira/build.gradle +++ b/comp_akira/build.gradle @@ -2,13 +2,10 @@ apply plugin: 'com.android.library' android { compileSdkVersion rootProject.ext.rtCompileSdkVersion - buildToolsVersion rootProject.ext.rtBuildToolsVersion defaultConfig { minSdkVersion rootProject.ext.rtMinSdkVersion targetSdkVersion rootProject.ext.rtTargetSdkVersion - versionCode rootProject.ext.rtVersionCode - versionName rootProject.ext.rtVersionName } buildTypes { diff --git a/comp_ask/build.gradle b/comp_ask/build.gradle index a012168f8..129af9cc6 100644 --- a/comp_ask/build.gradle +++ b/comp_ask/build.gradle @@ -2,13 +2,10 @@ apply plugin: 'com.android.library' android { compileSdkVersion rootProject.ext.rtCompileSdkVersion - buildToolsVersion rootProject.ext.rtBuildToolsVersion defaultConfig { minSdkVersion rootProject.ext.rtMinSdkVersion targetSdkVersion rootProject.ext.rtTargetSdkVersion - versionCode rootProject.ext.rtVersionCode - versionName rootProject.ext.rtVersionName } buildTypes { @@ -21,7 +18,7 @@ android { dependencies { api fileTree(include: ['*.jar'], dir: 'libs') - androidTestCompile('androidx.test.espresso:espresso-core:3.1.0', { + androidTestImplementation('androidx.test.espresso:espresso-core:3.1.0', { exclude group: 'com.android.support', module: 'support-annotations' }) implementation 'androidx.appcompat:appcompat:1.0.0' diff --git a/comp_banner/build.gradle b/comp_banner/build.gradle index 1f1820d6c..39ea9630b 100644 --- a/comp_banner/build.gradle +++ b/comp_banner/build.gradle @@ -6,8 +6,6 @@ android { defaultConfig { minSdkVersion rootProject.ext.rtMinSdkVersion targetSdkVersion rootProject.ext.rtTargetSdkVersion - versionCode rootProject.ext.rtVersionCode - versionName rootProject.ext.rtVersionName } buildTypes { @@ -25,7 +23,6 @@ android { // if true, only report errors ignoreWarnings true } - buildToolsVersion '27.0.3' } dependencies { diff --git a/comp_bigmath/build.gradle b/comp_bigmath/build.gradle index 4ff50da00..d70fc7a41 100644 --- a/comp_bigmath/build.gradle +++ b/comp_bigmath/build.gradle @@ -2,14 +2,11 @@ apply plugin: 'com.android.library' android { compileSdkVersion rootProject.ext.rtCompileSdkVersion - buildToolsVersion rootProject.ext.rtBuildToolsVersion defaultConfig { minSdkVersion rootProject.ext.rtMinSdkVersion targetSdkVersion rootProject.ext.rtTargetSdkVersion - versionCode rootProject.ext.rtVersionCode - versionName rootProject.ext.rtVersionName testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner' @@ -28,15 +25,15 @@ dependencies { api fileTree(dir: 'libs', include: ['*.jar']) implementation 'androidx.appcompat:appcompat:1.0.0' testImplementation 'junit:junit:4.12' - androidTestCompile('androidx.test.espresso:espresso-core:3.1.0', { + androidTestImplementation('androidx.test.espresso:espresso-core:3.1.0', { exclude group: 'com.android.support', module: 'support-annotations' }) - compile 'androidx.constraintlayout:constraintlayout:1.1.3' + api 'androidx.constraintlayout:constraintlayout:1.1.3' - compile project(path: ':util') - compile project(path: ':comp_logging') - compile project(path: ':resources') - compile project(path: ':comp_writebox') + api project(path: ':util') + api project(path: ':comp_logging') + api project(path: ':resources') + api project(path: ':comp_writebox') } diff --git a/comp_bubblepop/build.gradle b/comp_bubblepop/build.gradle index 8b4eb8c62..3c44ac213 100644 --- a/comp_bubblepop/build.gradle +++ b/comp_bubblepop/build.gradle @@ -2,13 +2,10 @@ apply plugin: 'com.android.library' android { compileSdkVersion rootProject.ext.rtCompileSdkVersion - buildToolsVersion rootProject.ext.rtBuildToolsVersion defaultConfig { minSdkVersion rootProject.ext.rtMinSdkVersion targetSdkVersion rootProject.ext.rtTargetSdkVersion - versionCode rootProject.ext.rtVersionCode - versionName rootProject.ext.rtVersionName } buildTypes { diff --git a/comp_bubblepop/src/main/java/cmu/xprize/bp_component/CBubble.java b/comp_bubblepop/src/main/java/cmu/xprize/bp_component/CBubble.java index d3b09111f..9bed33d45 100644 --- a/comp_bubblepop/src/main/java/cmu/xprize/bp_component/CBubble.java +++ b/comp_bubblepop/src/main/java/cmu/xprize/bp_component/CBubble.java @@ -20,6 +20,7 @@ import android.animation.Animator; import android.content.Context; +import android.content.res.AssetFileDescriptor; import android.graphics.Canvas; import android.graphics.Point; import android.graphics.PointF; @@ -38,6 +39,9 @@ import android.widget.LinearLayout; import android.widget.TextView; import android.util.TypedValue; +import android.widget.Toast; +import android.media.MediaPlayer; +import java.io.IOException; public class CBubble extends FrameLayout { @@ -89,6 +93,7 @@ public void init(Context context, AttributeSet attrs) { float instanceDensity = mContext.getResources().getDisplayMetrics().density; mScaleCorrection = BP_CONST.DESIGN_SCALE / instanceDensity; + showToast("Please Tap"); } @@ -165,6 +170,31 @@ public void setColor(String color) { // } // + + +public void showToast(String message) { + Toast.makeText(mContext, message, Toast.LENGTH_SHORT).show(); +// playAudioFromAssets("tutors/trackdata/LIBRARY/audio/en/cmu/xprize/bubble_pop/Please tap.mp3"); + + } + +// private void playAudioFromAssets(String fileName) { +// MediaPlayer mediaPlayer = new MediaPlayer(); +// try { +// AssetFileDescriptor afd = mContext.getAssets().openFd(fileName); +// mediaPlayer.setDataSource(afd.getFileDescriptor(), afd.getStartOffset(), afd.getLength()); +// afd.close(); +// mediaPlayer.prepare(); +// mediaPlayer.start(); +// mediaPlayer.setOnCompletionListener(MediaPlayer::release); +// } catch (IOException e) { +// e.printStackTrace(); +// Toast.makeText(mContext, "Failed to play audio: " + e.getMessage(), Toast.LENGTH_LONG).show(); +// } finally { +// mediaPlayer.release(); +// } +// } + public String getColor() { return mColor; } diff --git a/comp_clickmask/build.gradle b/comp_clickmask/build.gradle index 41c60b62b..148eae8b3 100644 --- a/comp_clickmask/build.gradle +++ b/comp_clickmask/build.gradle @@ -2,13 +2,10 @@ apply plugin: 'com.android.library' android { compileSdkVersion rootProject.ext.rtCompileSdkVersion - buildToolsVersion rootProject.ext.rtBuildToolsVersion defaultConfig { minSdkVersion rootProject.ext.rtMinSdkVersion targetSdkVersion rootProject.ext.rtTargetSdkVersion - versionCode rootProject.ext.rtVersionCode - versionName rootProject.ext.rtVersionName testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner' @@ -23,7 +20,7 @@ android { dependencies { api fileTree(dir: 'libs', include: ['*.jar']) - androidTestCompile('androidx.test.espresso:espresso-core:3.1.0', { + androidTestImplementation('androidx.test.espresso:espresso-core:3.1.0', { exclude group: 'com.android.support', module: 'support-annotations' }) implementation 'androidx.appcompat:appcompat:1.0.0' diff --git a/comp_counting/build.gradle b/comp_counting/build.gradle index 73178a027..a80f5339e 100644 --- a/comp_counting/build.gradle +++ b/comp_counting/build.gradle @@ -2,13 +2,10 @@ apply plugin: 'com.android.library' android { compileSdkVersion rootProject.ext.rtCompileSdkVersion - buildToolsVersion rootProject.ext.rtBuildToolsVersion defaultConfig { minSdkVersion rootProject.ext.rtMinSdkVersion targetSdkVersion rootProject.ext.rtTargetSdkVersion - versionCode rootProject.ext.rtVersionCode - versionName rootProject.ext.rtVersionName testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner' @@ -23,7 +20,7 @@ android { dependencies { api fileTree(dir: 'libs', include: ['*.jar']) - androidTestCompile('androidx.test.espresso:espresso-core:3.1.0', { + androidTestImplementation('androidx.test.espresso:espresso-core:3.1.0', { exclude group: 'com.android.support', module: 'support-annotations' }) implementation 'androidx.appcompat:appcompat:1.0.0' diff --git a/comp_counting2/build.gradle b/comp_counting2/build.gradle index cbe5bb449..d056d08f6 100644 --- a/comp_counting2/build.gradle +++ b/comp_counting2/build.gradle @@ -2,13 +2,10 @@ apply plugin: 'com.android.library' android { compileSdkVersion rootProject.ext.rtCompileSdkVersion - buildToolsVersion rootProject.ext.rtBuildToolsVersion defaultConfig { minSdkVersion rootProject.ext.rtMinSdkVersion targetSdkVersion rootProject.ext.rtTargetSdkVersion - versionCode rootProject.ext.rtVersionCode - versionName rootProject.ext.rtVersionName testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner' @@ -29,7 +26,7 @@ dependencies { implementation 'androidx.percentlayout:percentlayout:1.0.0' testImplementation 'junit:junit:4.12' - androidTestCompile('androidx.test.espresso:espresso-core:3.1.0', { + androidTestImplementation('androidx.test.espresso:espresso-core:3.1.0', { exclude group: 'com.android.support', module: 'support-annotations' }) api project(path: ':util') diff --git a/comp_debug/build.gradle b/comp_debug/build.gradle index 0cf5b1449..49fc785cc 100644 --- a/comp_debug/build.gradle +++ b/comp_debug/build.gradle @@ -2,13 +2,10 @@ apply plugin: 'com.android.library' android { compileSdkVersion rootProject.ext.rtCompileSdkVersion - buildToolsVersion rootProject.ext.rtBuildToolsVersion defaultConfig { minSdkVersion rootProject.ext.rtMinSdkVersion targetSdkVersion rootProject.ext.rtTargetSdkVersion - versionCode rootProject.ext.rtVersionCode - versionName rootProject.ext.rtVersionName } buildTypes { @@ -21,7 +18,7 @@ android { dependencies { api fileTree(include: ['*.jar'], dir: 'libs') - androidTestCompile('androidx.test.espresso:espresso-core:3.1.0', { + androidTestImplementation('androidx.test.espresso:espresso-core:3.1.0', { exclude group: 'com.android.support', module: 'support-annotations' }) implementation 'androidx.appcompat:appcompat:1.0.0' diff --git a/comp_intervention/build.gradle b/comp_intervention/build.gradle index 469e31efc..a22da7d3f 100644 --- a/comp_intervention/build.gradle +++ b/comp_intervention/build.gradle @@ -2,14 +2,11 @@ apply plugin: 'com.android.library' android { compileSdkVersion rootProject.ext.rtCompileSdkVersion - buildToolsVersion rootProject.ext.rtBuildToolsVersion defaultConfig { minSdkVersion rootProject.ext.rtMinSdkVersion targetSdkVersion rootProject.ext.rtTargetSdkVersion - versionCode rootProject.ext.rtVersionCode - versionName rootProject.ext.rtVersionName } buildTypes { @@ -28,7 +25,7 @@ dependencies { api fileTree(dir: 'libs', include: ['*.jar']) implementation 'androidx.appcompat:appcompat:1.0.0' testImplementation 'junit:junit:4.12' - androidTestCompile('androidx.test.espresso:espresso-core:3.1.0', { + androidTestImplementation('androidx.test.espresso:espresso-core:3.1.0', { exclude group: 'com.android.support', module: 'support-annotations' }) diff --git a/comp_listener/build.gradle b/comp_listener/build.gradle index f063d141e..218616513 100644 --- a/comp_listener/build.gradle +++ b/comp_listener/build.gradle @@ -2,13 +2,10 @@ apply plugin: 'com.android.library' android { compileSdkVersion rootProject.ext.rtCompileSdkVersion - buildToolsVersion rootProject.ext.rtBuildToolsVersion defaultConfig { minSdkVersion rootProject.ext.rtMinSdkVersion targetSdkVersion rootProject.ext.rtTargetSdkVersion - versionCode rootProject.ext.rtVersionCode - versionName rootProject.ext.rtVersionName } buildTypes { diff --git a/comp_logging/build.gradle b/comp_logging/build.gradle index cf42b0714..594d7a67f 100644 --- a/comp_logging/build.gradle +++ b/comp_logging/build.gradle @@ -2,13 +2,10 @@ apply plugin: 'com.android.library' android { compileSdkVersion rootProject.ext.rtCompileSdkVersion - buildToolsVersion rootProject.ext.rtBuildToolsVersion defaultConfig { minSdkVersion rootProject.ext.rtMinSdkVersion targetSdkVersion rootProject.ext.rtTargetSdkVersion - versionCode rootProject.ext.rtVersionCode - versionName rootProject.ext.rtVersionName testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner' @@ -23,7 +20,7 @@ android { dependencies { api fileTree(include: ['*.jar'], dir: 'libs') - androidTestCompile('androidx.test.espresso:espresso-core:3.1.0', { + androidTestImplementation('androidx.test.espresso:espresso-core:3.1.0', { exclude group: 'com.android.support', module: 'support-annotations' }) implementation 'androidx.appcompat:appcompat:1.0.0' diff --git a/comp_ltkplus/build.gradle b/comp_ltkplus/build.gradle index c345b187f..5da6dbe80 100644 --- a/comp_ltkplus/build.gradle +++ b/comp_ltkplus/build.gradle @@ -2,13 +2,10 @@ apply plugin: 'com.android.library' android { compileSdkVersion rootProject.ext.rtCompileSdkVersion - buildToolsVersion rootProject.ext.rtBuildToolsVersion defaultConfig { minSdkVersion rootProject.ext.rtMinSdkVersion targetSdkVersion rootProject.ext.rtTargetSdkVersion - versionCode rootProject.ext.rtVersionCode - versionName rootProject.ext.rtVersionName } buildTypes { diff --git a/comp_math/build.gradle b/comp_math/build.gradle index a30bbd760..2ace5c399 100644 --- a/comp_math/build.gradle +++ b/comp_math/build.gradle @@ -2,13 +2,10 @@ apply plugin: 'com.android.library' android { compileSdkVersion rootProject.ext.rtCompileSdkVersion - buildToolsVersion rootProject.ext.rtBuildToolsVersion defaultConfig { minSdkVersion rootProject.ext.rtMinSdkVersion targetSdkVersion rootProject.ext.rtTargetSdkVersion - versionCode rootProject.ext.rtVersionCode - versionName rootProject.ext.rtVersionName } buildTypes { diff --git a/comp_nd/build.gradle b/comp_nd/build.gradle index 96488ba41..5e12bf64e 100644 --- a/comp_nd/build.gradle +++ b/comp_nd/build.gradle @@ -2,13 +2,10 @@ apply plugin: 'com.android.library' android { compileSdkVersion rootProject.ext.rtCompileSdkVersion - buildToolsVersion rootProject.ext.rtBuildToolsVersion defaultConfig { minSdkVersion rootProject.ext.rtMinSdkVersion targetSdkVersion rootProject.ext.rtTargetSdkVersion - versionCode rootProject.ext.rtVersionCode - versionName rootProject.ext.rtVersionName testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner' @@ -27,7 +24,7 @@ dependencies { api fileTree(dir: 'libs', include: ['*.jar']) implementation 'androidx.appcompat:appcompat:1.0.0' testImplementation 'junit:junit:4.12' - androidTestCompile('androidx.test.espresso:espresso-core:3.1.0', { + androidTestImplementation('androidx.test.espresso:espresso-core:3.1.0', { exclude group: 'com.android.support', module: 'support-annotations' }) api project(path: ':util') diff --git a/comp_numberscale/build.gradle b/comp_numberscale/build.gradle index d07223e6e..31c61347d 100644 --- a/comp_numberscale/build.gradle +++ b/comp_numberscale/build.gradle @@ -3,12 +3,9 @@ apply plugin: 'com.android.library' android { compileSdkVersion rootProject.ext.rtCompileSdkVersion - buildToolsVersion rootProject.ext.rtBuildToolsVersion defaultConfig { minSdkVersion rootProject.ext.rtMinSdkVersion targetSdkVersion rootProject.ext.rtTargetSdkVersion - versionCode rootProject.ext.rtVersionCode - versionName rootProject.ext.rtVersionName // default is signed by the Android default key } diff --git a/comp_picmatch/build.gradle b/comp_picmatch/build.gradle index 78ef9fc76..c8dee3b91 100644 --- a/comp_picmatch/build.gradle +++ b/comp_picmatch/build.gradle @@ -2,12 +2,9 @@ apply plugin: 'com.android.library' android { compileSdkVersion rootProject.ext.rtCompileSdkVersion - buildToolsVersion rootProject.ext.rtBuildToolsVersion defaultConfig { minSdkVersion rootProject.ext.rtMinSdkVersion targetSdkVersion rootProject.ext.rtTargetSdkVersion - versionCode rootProject.ext.rtVersionCode - versionName rootProject.ext.rtVersionName // default is signed by the Android default key } @@ -25,7 +22,7 @@ dependencies { implementation 'androidx.appcompat:appcompat:1.0.0' implementation 'androidx.constraintlayout:constraintlayout:1.1.3' testImplementation 'junit:junit:4.12' - androidTestCompile('androidx.test.espresso:espresso-core:3.1.0', { + androidTestImplementation('androidx.test.espresso:espresso-core:3.1.0', { exclude group: 'com.android.support', module: 'support-annotations' }) diff --git a/comp_pointtap/build.gradle b/comp_pointtap/build.gradle index 27d3c026f..b7184d6be 100644 --- a/comp_pointtap/build.gradle +++ b/comp_pointtap/build.gradle @@ -2,13 +2,10 @@ apply plugin: 'com.android.library' android { compileSdkVersion rootProject.ext.rtCompileSdkVersion - buildToolsVersion rootProject.ext.rtBuildToolsVersion defaultConfig { minSdkVersion rootProject.ext.rtMinSdkVersion targetSdkVersion rootProject.ext.rtTargetSdkVersion - versionCode rootProject.ext.rtVersionCode - versionName rootProject.ext.rtVersionName } buildTypes { diff --git a/comp_questions/build.gradle b/comp_questions/build.gradle index 8cf233bf9..d5db727e6 100644 --- a/comp_questions/build.gradle +++ b/comp_questions/build.gradle @@ -2,14 +2,11 @@ apply plugin: 'com.android.library' android { compileSdkVersion rootProject.ext.rtCompileSdkVersion - buildToolsVersion rootProject.ext.rtBuildToolsVersion defaultConfig { minSdkVersion rootProject.ext.rtMinSdkVersion targetSdkVersion rootProject.ext.rtTargetSdkVersion - versionCode rootProject.ext.rtVersionCode - versionName rootProject.ext.rtVersionName testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner' diff --git a/comp_reading/build.gradle b/comp_reading/build.gradle index b1f41b7a9..517b54561 100644 --- a/comp_reading/build.gradle +++ b/comp_reading/build.gradle @@ -2,13 +2,10 @@ apply plugin: 'com.android.library' android { compileSdkVersion rootProject.ext.rtCompileSdkVersion - buildToolsVersion rootProject.ext.rtBuildToolsVersion defaultConfig { minSdkVersion rootProject.ext.rtMinSdkVersion targetSdkVersion rootProject.ext.rtTargetSdkVersion - versionCode rootProject.ext.rtVersionCode - versionName rootProject.ext.rtVersionName } buildTypes { diff --git a/comp_scoreboard/build.gradle b/comp_scoreboard/build.gradle index 2e46d524a..a84191ca0 100644 --- a/comp_scoreboard/build.gradle +++ b/comp_scoreboard/build.gradle @@ -2,13 +2,10 @@ apply plugin: 'com.android.library' android { compileSdkVersion rootProject.ext.rtCompileSdkVersion - buildToolsVersion rootProject.ext.rtBuildToolsVersion defaultConfig { minSdkVersion rootProject.ext.rtMinSdkVersion targetSdkVersion rootProject.ext.rtTargetSdkVersion - versionCode rootProject.ext.rtVersionCode - versionName rootProject.ext.rtVersionName } buildTypes { diff --git a/comp_session/build.gradle b/comp_session/build.gradle index a805ab821..33119f1fb 100644 --- a/comp_session/build.gradle +++ b/comp_session/build.gradle @@ -2,13 +2,10 @@ apply plugin: 'com.android.library' android { compileSdkVersion rootProject.ext.rtCompileSdkVersion - buildToolsVersion rootProject.ext.rtBuildToolsVersion defaultConfig { minSdkVersion rootProject.ext.rtMinSdkVersion targetSdkVersion rootProject.ext.rtTargetSdkVersion - versionCode rootProject.ext.rtVersionCode - versionName rootProject.ext.rtVersionName } buildTypes { @@ -21,7 +18,7 @@ android { dependencies { api fileTree(include: ['*.jar'], dir: 'libs') - androidTestCompile('androidx.test.espresso:espresso-core:3.1.0', { + androidTestImplementation('androidx.test.espresso:espresso-core:3.1.0', { exclude group: 'com.android.support', module: 'support-annotations' }) implementation 'androidx.appcompat:appcompat:1.0.0' diff --git a/comp_spelling/build.gradle b/comp_spelling/build.gradle index 7344e268f..f45b024ab 100644 --- a/comp_spelling/build.gradle +++ b/comp_spelling/build.gradle @@ -2,13 +2,10 @@ apply plugin: 'com.android.library' android { compileSdkVersion rootProject.ext.rtCompileSdkVersion - buildToolsVersion rootProject.ext.rtBuildToolsVersion defaultConfig { minSdkVersion rootProject.ext.rtMinSdkVersion targetSdkVersion rootProject.ext.rtTargetSdkVersion - versionCode rootProject.ext.rtVersionCode - versionName rootProject.ext.rtVersionName testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner' @@ -29,7 +26,7 @@ dependencies { implementation 'androidx.constraintlayout:constraintlayout:1.1.3' testImplementation 'junit:junit:4.12' - androidTestCompile('androidx.test.espresso:espresso-core:3.1.0', { + androidTestImplementation('androidx.test.espresso:espresso-core:3.1.0', { exclude group: 'com.android.support', module: 'support-annotations' }) diff --git a/comp_writebox/build.gradle b/comp_writebox/build.gradle index 7ce87eb0c..58b1e986e 100644 --- a/comp_writebox/build.gradle +++ b/comp_writebox/build.gradle @@ -2,13 +2,10 @@ apply plugin: 'com.android.library' android { compileSdkVersion rootProject.ext.rtCompileSdkVersion - buildToolsVersion rootProject.ext.rtBuildToolsVersion defaultConfig { minSdkVersion rootProject.ext.rtMinSdkVersion targetSdkVersion rootProject.ext.rtTargetSdkVersion - versionCode rootProject.ext.rtVersionCode - versionName rootProject.ext.rtVersionName } buildTypes { @@ -24,7 +21,7 @@ dependencies { api fileTree(dir: 'libs', include: ['*.jar']) implementation 'androidx.appcompat:appcompat:1.0.0' implementation 'junit:junit:4.12' - androidTestCompile('androidx.test.espresso:espresso-core:3.1.0', { + androidTestImplementation('androidx.test.espresso:espresso-core:3.1.0', { exclude group: 'com.android.support', module: 'support-annotations' }) diff --git a/comp_writing/build.gradle b/comp_writing/build.gradle index bbd74591f..1df52fcf1 100644 --- a/comp_writing/build.gradle +++ b/comp_writing/build.gradle @@ -2,13 +2,10 @@ apply plugin: 'com.android.library' android { compileSdkVersion rootProject.ext.rtCompileSdkVersion - buildToolsVersion rootProject.ext.rtBuildToolsVersion defaultConfig { minSdkVersion rootProject.ext.rtMinSdkVersion targetSdkVersion rootProject.ext.rtTargetSdkVersion - versionCode rootProject.ext.rtVersionCode - versionName rootProject.ext.rtVersionName } buildTypes { @@ -31,10 +28,10 @@ android { dependencies { api fileTree(include: ['*.jar'], dir: 'libs') testImplementation 'junit:junit:4.12' - compile 'androidx.appcompat:appcompat:1.0.0' - compile 'androidx.percentlayout:percentlayout:1.0.0' - compile project(path: ':util') - compile project(':comp_ltkplus') - compile project(path: ':comp_pointtap') - compile project(':comp_logging') + api 'androidx.appcompat:appcompat:1.0.0' + api 'androidx.percentlayout:percentlayout:1.0.0' + api project(path: ':util') + api project(':comp_ltkplus') + api project(path: ':comp_pointtap') + api project(':comp_logging') } diff --git a/fw_component/build.gradle b/fw_component/build.gradle index 7fbe2f1b5..970a810ad 100644 --- a/fw_component/build.gradle +++ b/fw_component/build.gradle @@ -2,13 +2,10 @@ apply plugin: 'com.android.library' android { compileSdkVersion rootProject.ext.rtCompileSdkVersion - buildToolsVersion rootProject.ext.rtBuildToolsVersion defaultConfig { minSdkVersion rootProject.ext.rtMinSdkVersion targetSdkVersion rootProject.ext.rtTargetSdkVersion - versionCode rootProject.ext.rtVersionCode - versionName rootProject.ext.rtVersionName } buildTypes { diff --git a/gradle.properties b/gradle.properties index df730a970..ae6cd3962 100644 --- a/gradle.properties +++ b/gradle.properties @@ -12,7 +12,7 @@ # Default value: -Xmx10248m -XX:MaxPermSize=256m android.enableJetifier=true android.useAndroidX=true -org.gradle.jvmargs=-Xmx3072m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8 +org.gradle.jvmargs=-Xmx3072m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8 --add-opens java.base/java.io=ALL-UNNAMED # When configured, Gradle will run in incubating parallel mode. # This option should only be used with decoupled projects. More details, visit diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 130c81d44..606aed876 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.5-bin.zip diff --git a/mn_component/build.gradle b/mn_component/build.gradle index c8b1c0798..30d58158d 100644 --- a/mn_component/build.gradle +++ b/mn_component/build.gradle @@ -2,13 +2,10 @@ apply plugin: 'com.android.library' android { compileSdkVersion rootProject.ext.rtCompileSdkVersion - buildToolsVersion rootProject.ext.rtBuildToolsVersion defaultConfig { minSdkVersion rootProject.ext.rtMinSdkVersion targetSdkVersion rootProject.ext.rtTargetSdkVersion - versionCode rootProject.ext.rtVersionCode - versionName rootProject.ext.rtVersionName } buildTypes { diff --git a/nl_component/build.gradle b/nl_component/build.gradle index 07748e8fb..a8d7b7dda 100644 --- a/nl_component/build.gradle +++ b/nl_component/build.gradle @@ -2,13 +2,10 @@ apply plugin: 'com.android.library' android { compileSdkVersion rootProject.ext.rtCompileSdkVersion - buildToolsVersion rootProject.ext.rtBuildToolsVersion defaultConfig { minSdkVersion rootProject.ext.rtMinSdkVersion targetSdkVersion rootProject.ext.rtTargetSdkVersion - versionCode rootProject.ext.rtVersionCode - versionName rootProject.ext.rtVersionName } buildTypes { diff --git a/resources/build.gradle b/resources/build.gradle index fee5f9934..480a1b086 100644 --- a/resources/build.gradle +++ b/resources/build.gradle @@ -2,14 +2,11 @@ apply plugin: 'com.android.library' android { compileSdkVersion rootProject.ext.rtCompileSdkVersion - buildToolsVersion rootProject.ext.rtBuildToolsVersion defaultConfig { minSdkVersion rootProject.ext.rtMinSdkVersion targetSdkVersion rootProject.ext.rtTargetSdkVersion - versionCode rootProject.ext.rtVersionCode - versionName rootProject.ext.rtVersionName } @@ -26,7 +23,7 @@ dependencies { api fileTree(dir: 'libs', include: ['*.jar']) implementation 'androidx.appcompat:appcompat:1.0.0' testImplementation 'junit:junit:4.12' - androidTestCompile('androidx.test.espresso:espresso-core:3.1.0', { + androidTestImplementation('androidx.test.espresso:espresso-core:3.1.0', { exclude group: 'com.android.support', module: 'support-annotations' }) diff --git a/sm_component/build.gradle b/sm_component/build.gradle index c8b1c0798..30d58158d 100644 --- a/sm_component/build.gradle +++ b/sm_component/build.gradle @@ -2,13 +2,10 @@ apply plugin: 'com.android.library' android { compileSdkVersion rootProject.ext.rtCompileSdkVersion - buildToolsVersion rootProject.ext.rtBuildToolsVersion defaultConfig { minSdkVersion rootProject.ext.rtMinSdkVersion targetSdkVersion rootProject.ext.rtTargetSdkVersion - versionCode rootProject.ext.rtVersionCode - versionName rootProject.ext.rtVersionName } buildTypes { diff --git a/util/build.gradle b/util/build.gradle index 4f45dc310..efb7334b5 100644 --- a/util/build.gradle +++ b/util/build.gradle @@ -2,13 +2,10 @@ apply plugin: 'com.android.library' android { compileSdkVersion rootProject.ext.rtCompileSdkVersion - buildToolsVersion rootProject.ext.rtBuildToolsVersion defaultConfig { minSdkVersion rootProject.ext.rtMinSdkVersion targetSdkVersion rootProject.ext.rtTargetSdkVersion - versionCode rootProject.ext.rtVersionCode - versionName rootProject.ext.rtVersionName } buildTypes { @@ -38,6 +35,6 @@ dependencies { testImplementation 'org.json:json:20140107' implementation 'androidx.appcompat:appcompat:1.0.0' api 'androidx.percentlayout:percentlayout:1.0.0' - compile files('libs/datashop-logging.jar') + api files('libs/datashop-logging.jar') api project(':comp_logging') }