Move compat

compat/build.gradle

@@ -0,0 +1,18 @@
+/*
+ * SPDX-FileCopyrightText: 2013, microG Project Team
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+apply plugin: 'java'
+
+def sdkDir = System.env.ANDROID_HOME
+if (!sdkDir) {
+    Properties properties = new Properties()
+    properties.load(project.rootProject.file('local.properties').newDataInputStream())
+    sdkDir = properties.getProperty('sdk.dir')
+}
+
+sourceSets.main {
+    java.srcDirs = ['src/current/java', 'src/v9/java']
+    compileClasspath += project.rootProject.files("$sdkDir/platforms/android-$androidCompileSdk/android.jar")
+}

compat/src/current/java/android/location/GeocoderParams.java

@@ -1,17 +1,7 @@
 /*
- * Copyright (C) 2010 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * SPDX-FileCopyrightText: 2010, The Android Open Source Project
+ * SPDX-FileCopyrightText: 2014, microG Project Team
+ * SPDX-License-Identifier: Apache-2.0
  */
 
 package android.location;

compat/src/current/java/android/location/Geofence.java

@@ -1,17 +1,7 @@
 /*
- * Copyright (C) 2012 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * SPDX-FileCopyrightText: 2012, The Android Open Source Project
+ * SPDX-FileCopyrightText: 2014, microG Project Team
+ * SPDX-License-Identifier: Apache-2.0
  */
 
 package android.location;

compat/src/current/java/android/location/Location.java

@@ -1,17 +1,7 @@
 /*
- * Copyright (C) 2007 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * SPDX-FileCopyrightText: 2007, The Android Open Source Project
+ * SPDX-FileCopyrightText: 2014, microG Project Team
+ * SPDX-License-Identifier: Apache-2.0
  */
 
 package android.location;

compat/src/current/java/android/location/LocationManager.java

@@ -1,17 +1,7 @@
 /*
- * Copyright (C) 2007 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * SPDX-FileCopyrightText: 2007, The Android Open Source Project
+ * SPDX-FileCopyrightText: 2014, microG Project Team
+ * SPDX-License-Identifier: Apache-2.0
  */
 
 package android.location;

compat/src/current/java/android/location/LocationRequest.java

@@ -1,17 +1,7 @@
 /*
- * Copyright (C) 2012 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * SPDX-FileCopyrightText: 2012, The Android Open Source Project
+ * SPDX-FileCopyrightText: 2014, microG Project Team
+ * SPDX-License-Identifier: Apache-2.0
  */
 
 package android.location;

compat/src/current/java/com/android/internal/location/ProviderProperties.java

@@ -1,17 +1,7 @@
 /*
- * Copyright (C) 2012 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * SPDX-FileCopyrightText: 2012, The Android Open Source Project
+ * SPDX-FileCopyrightText: 2014, microG Project Team
+ * SPDX-License-Identifier: Apache-2.0
  */
 
 package com.android.internal.location;

compat/src/current/java/com/android/internal/location/ProviderRequest.java

@@ -1,17 +1,7 @@
 /*
- * Copyright (C) 2012 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * SPDX-FileCopyrightText: 2012, The Android Open Source Project
+ * SPDX-FileCopyrightText: 2014, microG Project Team
+ * SPDX-License-Identifier: Apache-2.0
  */
 
 package com.android.internal.location;

compat/src/current/java/com/android/location/provider/GeocodeProvider.java

@@ -1,17 +1,7 @@
 /*
- * Copyright (C) 2010 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * SPDX-FileCopyrightText: 2010, The Android Open Source Project
+ * SPDX-FileCopyrightText: 2014, microG Project Team
+ * SPDX-License-Identifier: Apache-2.0
  */
 
 package com.android.location.provider;

compat/src/current/java/com/android/location/provider/LocationProviderBase.java

@@ -1,17 +1,7 @@
 /*
- * Copyright (C) 2010 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * SPDX-FileCopyrightText: 2010, The Android Open Source Project
+ * SPDX-FileCopyrightText: 2014, microG Project Team
+ * SPDX-License-Identifier: Apache-2.0
  */
 
 package com.android.location.provider;

compat/src/current/java/com/android/location/provider/LocationRequestUnbundled.java

@@ -1,17 +1,7 @@
 /*
- * Copyright (C) 2012 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * SPDX-FileCopyrightText: 2012, The Android Open Source Project
+ * SPDX-FileCopyrightText: 2014, microG Project Team
+ * SPDX-License-Identifier: Apache-2.0
  */
 
 package com.android.location.provider;

compat/src/current/java/com/android/location/provider/ProviderPropertiesUnbundled.java

@@ -1,17 +1,7 @@
 /*
- * Copyright (C) 2012 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * SPDX-FileCopyrightText: 2012, The Android Open Source Project
+ * SPDX-FileCopyrightText: 2014, microG Project Team
+ * SPDX-License-Identifier: Apache-2.0
  */
 
 package com.android.location.provider;

compat/src/current/java/com/android/location/provider/ProviderRequestUnbundled.java

@@ -1,17 +1,7 @@
 /*
- * Copyright (C) 2012 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * SPDX-FileCopyrightText: 2012, The Android Open Source Project
+ * SPDX-FileCopyrightText: 2014, microG Project Team
+ * SPDX-License-Identifier: Apache-2.0
  */
 
 package com.android.location.provider;

compat/src/v9/java/com/android/location/provider/LocationProvider.java

@@ -1,24 +1,13 @@
 /*
- * Copyright (C) 2010 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * SPDX-FileCopyrightText: 2010, The Android Open Source Project
+ * SPDX-FileCopyrightText: 2014, microG Project Team
+ * SPDX-License-Identifier: Apache-2.0
  */
 
 package com.android.location.provider;
 
 import android.location.Criteria;
 import android.location.Location;
-import android.net.NetworkInfo;
 import android.os.Bundle;
 import android.os.IBinder;
 import android.os.WorkSource;
@@ -203,7 +192,8 @@ public abstract class LocationProvider {
      *
      * @param state data state
      */
-    public abstract void onUpdateNetworkState(int state, NetworkInfo info);
+    @SuppressWarnings("deprecation")
+    public abstract void onUpdateNetworkState(int state, android.net.NetworkInfo info);
 
     /**
      * Informs the provider when a new location has been computed by a different

unifiednlp-compat/build.gradle

@@ -1,29 +0,0 @@
-/*
- * Copyright 2013-2016 microG Project Team
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-apply plugin: 'java'
-
-def sdkDir = System.env.ANDROID_HOME
-if (!sdkDir) {
-    Properties properties = new Properties()
-    properties.load(project.rootProject.file('local.properties').newDataInputStream())
-    sdkDir = properties.getProperty('sdk.dir')
-}
-
-sourceSets.main {
-    java.srcDirs = ['src/current/java', 'src/v9/java']
-    compileClasspath += project.rootProject.files("$sdkDir/platforms/android-27/android.jar")
-}