Merge pull request #552 from jspricke/sdk29 (735dc07d) · Commits · e / os / Calendar

.gitmodules

+3 −3

Original line number	Diff line number	Diff line
		[submodule "external/colorpicker"]
		path = external/colorpicker
		url = https://github.com/Etar-Group/android_frameworks_opt_colorpicker.git
		branch = master
		branch = rebase
		[submodule "external/datetimepicker"]
		path = external/datetimepicker
		url = https://github.com/Etar-Group/android_frameworks_opt_datetimepicker.git
		@@ -20,5 +20,5 @@
		branch = master
		[submodule "external/chips"]
		path = external/chips
		url = https://github.com/Etar-Group/android_frameworks_opt_chips
		branch = master
		url = https://github.com/Etar-Group/android_frameworks_opt_chips.git
		branch = rebase

AndroidManifest.xml

+2 −2

Original line number	Diff line number	Diff line
		@@ -37,7 +37,7 @@
		<uses-permission android:name="android.permission.WRITE_CALENDAR" />
		<uses-permission android:name="android.permission.WAKE_LOCK" />
		<uses-permission android:name="android.permission.READ_SYNC_SETTINGS" />

		<uses-permission android:name="android.permission.FOREGROUND_SERVICE" />

		<application android:name="com.android.calendar.CalendarApplication"
		android:hardwareAccelerated="true"
		@@ -186,7 +186,7 @@
		</activity>

		<provider
		android:name="android.support.v4.content.FileProvider"
		android:name="androidx.core.content.FileProvider"
		android:authorities="${applicationId}.provider"
		android:exported="false"
		android:grantUriPermissions="true">

build.gradle

+23 −23

Original line number	Diff line number	Diff line
		@@ -5,7 +5,7 @@ buildscript {
		}

		dependencies {
		classpath 'com.android.tools.build:gradle:3.1.3'
		classpath 'com.android.tools.build:gradle:3.4.2'
		}
		}

		@@ -20,12 +20,12 @@ project(':external:calendar') {
		apply plugin: 'android-library'

		android {
		compileSdkVersion 27
		buildToolsVersion '27.0.3'
		compileSdkVersion 29
		buildToolsVersion '29.0.2'

		defaultConfig {
		minSdkVersion 19
		targetSdkVersion 27
		targetSdkVersion 29
		}

		sourceSets {
		@@ -51,12 +51,12 @@ project(':external:colorpicker') {
		apply plugin: 'android-library'

		android {
		compileSdkVersion 27
		buildToolsVersion '27.0.3'
		compileSdkVersion 29
		buildToolsVersion '29.0.2'

		defaultConfig {
		minSdkVersion 19
		targetSdkVersion 27
		targetSdkVersion 29
		}

		sourceSets {
		@@ -77,16 +77,16 @@ project(':external:datetimepicker') {
		apply plugin: 'android-library'

		dependencies {
		implementation 'com.android.support:support-v4:27.1.1'
		implementation 'androidx.legacy:legacy-support-v4:1.0.0'
		}

		android {
		compileSdkVersion 27
		buildToolsVersion '27.0.3'
		compileSdkVersion 29
		buildToolsVersion '29.0.2'

		defaultConfig {
		minSdkVersion 19
		targetSdkVersion 27
		targetSdkVersion 29
		}

		sourceSets {
		@@ -111,16 +111,16 @@ project(':external:timezonepicker') {
		apply plugin: 'android-library'

		dependencies {
		implementation 'com.android.support:support-v4:27.1.1'
		implementation 'androidx.legacy:legacy-support-v4:1.0.0'
		}

		android {
		compileSdkVersion 27
		buildToolsVersion '27.0.3'
		compileSdkVersion 29
		buildToolsVersion '29.0.2'

		defaultConfig {
		minSdkVersion 19
		targetSdkVersion 27
		targetSdkVersion 29
		}

		sourceSets {
		@@ -144,12 +144,12 @@ project(':external:chips') {
		apply plugin: 'android-library'

		android {
		compileSdkVersion 27
		buildToolsVersion '27.0.3'
		compileSdkVersion 29
		buildToolsVersion '29.0.2'

		defaultConfig {
		minSdkVersion 19
		targetSdkVersion 27
		targetSdkVersion 29
		}

		sourceSets {
		@@ -174,8 +174,8 @@ project(':external:chips') {
		apply plugin: 'com.android.application'

		dependencies {
		implementation 'com.android.support:support-v4:27.1.1'
		implementation 'com.android.support:design:27.1.1'
		implementation 'androidx.legacy:legacy-support-v4:1.0.0'
		implementation 'com.google.android.material:material:1.0.0'
		implementation project(':external:calendar')
		implementation project(':external:colorpicker')
		implementation project(':external:datetimepicker')
		@@ -184,12 +184,12 @@ dependencies {
		}

		android {
		compileSdkVersion 27
		buildToolsVersion '27.0.3'
		compileSdkVersion 29
		buildToolsVersion '29.0.2'

		defaultConfig {
		minSdkVersion 19
		targetSdkVersion 27
		targetSdkVersion 29
		}

		useLibrary 'org.apache.http.legacy'

calendar @ 1aea8315

Original line number	Diff line number	Diff line
		Subproject commit 72af45fd2b6a6fd0f14b25fdb4b98b435a0c24e3
		Subproject commit 1aea8315ebe9cca6e9462ab02e9f4caf20c8cd58

chips @ 396c6151

Original line number	Diff line number	Diff line
		Subproject commit 1e2235735494d37e0f9852298853410bf4c88dc2
		Subproject commit 396c6151cbfeaecea90fc1f0dc23dac6466a169b