More build fixes (#1)

* Update samples.zip

Update samples to work with MakeCode (v0 & v1) from .co.uk.

* Update samples.zip

Update samples to use MakeCode v0 for compatibility.

* Separate source files

* updated build files for compilation

updated build files for compilation

* More build fixes and added .gitignore

Author: dnlbaines

.gitignore

@@ -0,0 +1,41 @@
+# Built application files
+/*/build/
+build/
+app/release/
+
+# Crashlytics configuations
+com_crashlytics_export_strings.xml
+
+# Local configuration file (sdk path, etc)
+local.properties
+
+# Gradle generated files
+.gradle/
+
+# Signing files
+.signing/
+
+# User-specific configurations
+.idea/libraries/
+.idea/workspace.xml
+.idea/tasks.xml
+.idea/.name
+.idea/compiler.xml
+.idea/copyright/profiles_settings.xml
+.idea/encodings.xml
+.idea/misc.xml
+.idea/modules.xml
+.idea/scopes/scope_settings.xml
+.idea/vcs.xml
+.idea/caches/
+.idea/codeStyles/
+*.iml
+
+# OS-specific files
+.DS_Store
+.DS_Store?
+._*
+.Spotlight-V100
+.Trashes
+ehthumbs.db
+Thumbs.db

.idea/gradle.xml

@@ -7,7 +7,7 @@ micro:bit Android application
 
     * [Android SDK](http://developer.android.com/sdk/index.html)
 
-    * [Gradle](https://gradle.org/gradle-download/) (Minimum version [2.14.1+](https://developer.android.com/studio/releases/gradle-plugin.html#updating-gradle))
+    * [Gradle](https://gradle.org/gradle-download/) (Minimum version [4.6+](https://developer.android.com/studio/releases/gradle-plugin.html#updating-gradle))
 
 * Go to root directory and run `gradle build`. After build is finished, apk file can be found under `~/app/build/outputs/apk/app-debug.apk`
 

.idea/runConfigurations.xml

@@ -1,12 +1,12 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 23
-    buildToolsVersion '22.0.1'
+    compileSdkVersion 26
+    buildToolsVersion '28.0.3'
     defaultConfig {
         applicationId "com.samsung.microbit"
         minSdkVersion 19
-        targetSdkVersion 23
+        targetSdkVersion 26
     }
     buildTypes {
         release {
@@ -22,12 +22,13 @@ android {
 }
 
 dependencies {
-    testCompile 'junit:junit:4.12'
-    compile 'com.android.support:appcompat-v7:23.1.0'
-    compile 'com.android.support:design:23.1.0'
-    compile project(':dfuLibrary')
-    compile 'com.android.support:cardview-v7:23.1.0'
-    compile 'com.android.support:recyclerview-v7:23.1.0'
-    compile project(':android-gif-drawable-1.1.13')
-    compile 'com.google.android.gms:play-services-analytics:9.2.0'
+    testImplementation 'junit:junit:4.12'
+    implementation 'com.android.support:appcompat-v7:23.1.0'
+    implementation 'com.android.support:design:23.1.0'
+    implementation project(':dfuLibrary')
+    implementation 'com.android.support:cardview-v7:23.1.0'
+    implementation 'com.android.support:recyclerview-v7:23.1.0'
+    implementation project(':android-gif-drawable-1.1.13')
+    implementation 'com.google.android.gms:play-services-analytics:9.2.0'
+    implementation 'com.google.code.gson:gson:2.8.2'
 }

README.md

@@ -15,8 +15,8 @@
 -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
           package="com.samsung.microbit"
-          android:versionCode="12"
-          android:versionName="2.0">
+          android:versionCode="16"
+          android:versionName="2.4">
 
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
     <uses-permission android:name="android.permission.ACCESS_WIFI_STATE"/>
@@ -31,7 +31,6 @@
     <uses-permission android:name="android.permission.INTERACT_ACROSS_USERS_FULL"  android:protectionLevel="signature"/>
     <uses-permission android:name="android.permission.WAKE_LOCK"/>
     <uses-permission android:name="android.permission.READ_PHONE_STATE"/>
-    <uses-permission android:name="android.permission.RECEIVE_SMS"/>
     <uses-permission android:name="android.permission.CAMERA"/>
 
 

app/build.gradle

@@ -1,16 +1,18 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 buildscript {
     repositories {
-        jcenter()
+        google()
+	jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.2.1'
+        classpath 'com.android.tools.build:gradle:3.2.1'
         classpath 'com.google.gms:google-services:3.0.0'
     }
 }
 
 allprojects {
     repositories {
-        jcenter()
+        google()
+	jcenter()
     }
 }

app/src/main/AndroidManifest.xml

@@ -2,7 +2,7 @@ apply plugin: 'com.android.library'
 
 android {
     compileSdkVersion 23
-    buildToolsVersion '22.0.0'
+    buildToolsVersion '28.0.3'
 
     defaultConfig {
         minSdkVersion 19
@@ -18,9 +18,9 @@ android {
 }
 
 dependencies {
-    compile 'com.google.code.gson:gson:2.2.1'
-    compile 'com.android.support:appcompat-v7:23.0.0'
-    compile fileTree(dir: 'libs', include: ['*.jar'])
+    implementation 'com.google.code.gson:gson:2.8.2'
+    implementation 'com.android.support:appcompat-v7:23.0.0'
+    implementation fileTree(dir: 'libs', include: ['*.jar'])
 }
 
 

app/src/main/res/raw/samples.zip

@@ -3,9 +3,7 @@
     android:versionCode="1"
     android:versionName="1.0" >
 
-    <uses-sdk
-        android:minSdkVersion="18"
-        android:targetSdkVersion="21" />
+
     <uses-permission android:name="android.permission.BLUETOOTH" />
     <uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />
 </manifest>

build.gradle

@@ -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-2.14.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip