From c8d6ab8ef68093195e7937b4cfee29a680646ee4 Mon Sep 17 00:00:00 2001 From: Antonio Leiva Date: Thu, 22 Oct 2015 10:46:42 +0200 Subject: [PATCH 1/3] Update README.md to explain about versions --- README.md | 21 +++++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 76b6809..8515b44 100644 --- a/README.md +++ b/README.md @@ -1,11 +1,13 @@ # Kotlin for Android Developers (the book) -This is the code used you can use to follow the book. +This is the code you can use to follow the book. [https://antonioleiva.com/kotlin-android-developers-book/](https://antonioleiva.com/kotlin-android-developers-book/) Are you tired of using an ancient, inexpressive and unsafe language to develop your Android apps? Do you cry out loud every time you see a Null Pointer Exception in your bug tracker? Then Kotlin is your solution! A language specifically created for Java developers, easy to learn, expressive, null safe and really intuitive. Your productivity will boost and your apps will become more robust. Learn Kotlin the easy way by example and discover the tricks that will make coding easier. +And now, it's officially supported by Google! + ![Kotlin for Android Developers cover](art/kotlin-android-developers.png?raw=true) ## About the book @@ -16,10 +18,25 @@ Are you tired of using an ancient, inexpressive and unsafe language to develop y [The book](https://antonioleiva.com/kotlin-android-developers-book/) is very practical, so it is recommended to follow the examples and the code in front of a computer and try everything it's suggested. You could, however, take a first read to get a broad idea and then dive into practice. +## Versions + +As I update the book, I need to push -f this repository with the new changes, so that it matches with the new text. + +That means that if you are reading an old version of the book, main branches won't be aligned with your text. + +To make things easier, I'll keep track of those versions in separates branches, which will be linked from here: + +- 7th edition: February 2019 (current) +- 6th edition: [April 2018](https://github.com/antoniolg/Kotlin-for-Android-Developers/tree/master-april-2018) +- [5th edition: September 2017](https://github.com/antoniolg/Kotlin-for-Android-Developers/tree/master-september-2017) +- [4th edition: July 2017](https://github.com/antoniolg/Kotlin-for-Android-Developers/tree/master-july-2017) +- [3rd edition: June 2017](https://github.com/antoniolg/Kotlin-for-Android-Developers/tree/master-june-2017) +- [2nd edition: January 2017](https://github.com/antoniolg/Kotlin-for-Android-Developers/tree/master-january-2017) +- [1st edition: March 2016](https://github.com/antoniolg/Kotlin-for-Android-Developers/tree/master-march-2016) ## License - Copyright 2017 Antonio Leiva + Copyright 2019 Antonio Leiva Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. From c525ad1c3ef7277b76735372eb58489f9286724e Mon Sep 17 00:00:00 2001 From: Danilo Menezes Date: Sat, 19 Oct 2019 14:59:20 +0100 Subject: [PATCH 2/3] Add xml config to enable cleartext to desired endpoint --- app/build.gradle | 5 +++++ app/src/main/AndroidManifest.xml | 1 + app/src/main/res/xml/network_security_config.xml | 6 ++++++ 3 files changed, 12 insertions(+) create mode 100644 app/src/main/res/xml/network_security_config.xml diff --git a/app/build.gradle b/app/build.gradle index e5efcc1..fd48182 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -21,6 +21,11 @@ android { proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' } } + compileOptions { + sourceCompatibility = 1.8 + targetCompatibility = 1.8 + } + buildToolsVersion = '28.0.3' } androidExtensions { diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 0dfbd3a..9a788d0 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -9,6 +9,7 @@ android:name=".ui.App" android:allowBackup="true" android:icon="@mipmap/ic_launcher" + android:networkSecurityConfig="@xml/network_security_config" android:label="@string/app_name" android:theme="@style/AppTheme"> + + + api.openweathermap.org + + \ No newline at end of file From 6cd741c51bf4b5ceec8f54c7e0514fb77c5d7596 Mon Sep 17 00:00:00 2001 From: Danilo Menezes Date: Sat, 19 Oct 2019 15:02:15 +0100 Subject: [PATCH 3/3] revert build.gradle --- app/build.gradle | 5 ----- 1 file changed, 5 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index fd48182..e5efcc1 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -21,11 +21,6 @@ android { proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' } } - compileOptions { - sourceCompatibility = 1.8 - targetCompatibility = 1.8 - } - buildToolsVersion = '28.0.3' } androidExtensions {